Skip to content

Commit

Permalink
fixing CMakeLists format
Browse files Browse the repository at this point in the history
  • Loading branch information
mgonzs13 committed Nov 10, 2024
1 parent 53ffd21 commit ae86a39
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 47 deletions.
1 change: 1 addition & 0 deletions yasmin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ project(yasmin)
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()
Expand Down
29 changes: 5 additions & 24 deletions yasmin_demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,51 +63,31 @@ set(DEPENDENCIES
)

# demo
add_executable(yasmin_demo
src/yasmin_demo.cpp
)
set(SOURCES
src/yasmin_demo.cpp
)
add_executable(yasmin_demo src/yasmin_demo.cpp)
ament_target_dependencies(yasmin_demo ${DEPENDENCIES})
install(TARGETS
yasmin_demo
DESTINATION lib/${PROJECT_NAME}
)

# monitor demo
add_executable(monitor_demo
src/monitor_demo.cpp
)
set(SOURCES
src/monitor_demo.cpp
)
add_executable(monitor_demo src/monitor_demo.cpp)
ament_target_dependencies(monitor_demo ${DEPENDENCIES})
install(TARGETS
monitor_demo
DESTINATION lib/${PROJECT_NAME}
)

# service client demo
add_executable(service_client_demo
src/service_client_demo.cpp
)
set(SOURCES
src/service_client_demo.cpp
)
add_executable(service_client_demo src/service_client_demo.cpp)
ament_target_dependencies(service_client_demo ${DEPENDENCIES})
install(TARGETS
service_client_demo
DESTINATION lib/${PROJECT_NAME}
)

# action client demo
add_executable(action_client_demo
src/action_client_demo.cpp
)
set(SOURCES
src/action_client_demo.cpp
)
add_executable(action_client_demo src/action_client_demo.cpp)
ament_target_dependencies(action_client_demo ${DEPENDENCIES})
install(TARGETS
action_client_demo
Expand All @@ -117,6 +97,7 @@ install(TARGETS
ament_export_include_directories(include)
ament_export_libraries(${LIB})


# Python
ament_python_install_package(${PROJECT_NAME})

Expand Down
21 changes: 0 additions & 21 deletions yasmin_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
cmake_minimum_required(VERSION 3.5)
project(yasmin_msgs)

# Default to C99
if(NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 99)
endif()

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
Expand All @@ -17,22 +12,6 @@ endif()

# find dependencies
find_package(ament_cmake REQUIRED)

# uncomment the following section in order to fill in
# further dependencies manually.
# find_package(<dependency> REQUIRED)
if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)

# the following line skips the linter which checks for copyrights
# uncomment the line when a copyright and license is not present in all source files
# set(ament_cmake_copyright_FOUND TRUE)
# the following line skips cpplint (only works in a git repo)
# uncomment the line when this package is not in a git repo
# set(ament_cmake_cpplint_FOUND TRUE)
ament_lint_auto_find_test_dependencies()
endif()

find_package(rosidl_default_generators REQUIRED)

rosidl_generate_interfaces(${PROJECT_NAME}
Expand Down
3 changes: 1 addition & 2 deletions yasmin_ros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()


if(NOT DEFINED ENV{ROS_DISTRO})
message(FATAL_ERROR "ROS_DISTRO is not defined." )
endif()
Expand Down Expand Up @@ -64,7 +63,6 @@ set(DEPENDENCIES
)

add_library(${LIB} STATIC ${SOURCES})

ament_target_dependencies(${LIB} ${DEPENDENCIES})

install(TARGETS ${LIB}
Expand All @@ -81,6 +79,7 @@ ament_export_include_directories(include)
ament_export_libraries(${LIB})
ament_export_dependencies(${DEPENDENCIES})


# Python
ament_python_install_package(${PROJECT_NAME})

Expand Down

0 comments on commit ae86a39

Please sign in to comment.