Add target specific compiler flags

ntl-ros-pkg · Feb 12, 2019 · b800adc · b800adc
1 parent 196390f
commit b800adc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 67 deletions.
diff --git a/trajopt/CMakeLists.txt b/trajopt/CMakeLists.txt
@@ -1,13 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(trajopt)
 
-add_compile_options(
-  -std=c++11
-  -Wall
-  -Wextra
-  -Wsuggest-override
-  -Wconversion
-  -Wsign-conversion)
+add_compile_options(-std=c++11 -Wall -Wextra)
 
 find_package(catkin REQUIRED COMPONENTS
   trajopt_sco
@@ -65,6 +59,7 @@ include_directories(
 
 add_library(${PROJECT_NAME} ${TRAJOPT_SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${JSONCPP_LIBRARIES} ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME} PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 # Mark executables and/or libraries for installation
 install(TARGETS ${PROJECT_NAME}
@@ -94,22 +89,29 @@ if (CATKIN_ENABLE_TESTING)
 
   add_rostest_gtest(${PROJECT_NAME}_planning_unit test/planning_unit.launch test/planning_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_planning_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_planning_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_interface_unit test/interface_unit.launch test/interface_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_interface_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_interface_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_costs_unit test/costs_unit.launch test/costs_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_costs_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_costs_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_cast_cost_unit test/cast_cost_unit.launch test/cast_cost_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_cast_cost_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_cast_cost_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_cast_cost_world_unit test/cast_cost_world_unit.launch test/cast_cost_world_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_cast_cost_world_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_cast_cost_world_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_cast_cost_attached_unit test/cast_cost_attached_unit.launch test/cast_cost_attached_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_cast_cost_attached_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_cast_cost_attached_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   add_rostest_gtest(${PROJECT_NAME}_cast_cost_octomap_unit test/cast_cost_octomap_unit.launch test/cast_cost_octomap_unit.cpp)
   target_link_libraries(${PROJECT_NAME}_cast_cost_octomap_unit ${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${PCL_LIBRARIES} ${catkin_LIBRARIES})
+  target_compile_options(${PROJECT_NAME}_cast_cost_octomap_unit PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 endif()
diff --git a/trajopt_examples/CMakeLists.txt b/trajopt_examples/CMakeLists.txt
@@ -1,13 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(trajopt_examples)
 
-add_compile_options(
-  -std=c++11
-  -Wall
-  -Wextra
-  -Wsuggest-override
-  -Wconversion
-  -Wsign-conversion)
+add_compile_options(-std=c++11 -Wall -Wextra)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp
@@ -20,12 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
 
 find_package(PCL REQUIRED COMPONENTS core features filters io segmentation surface)
 
-catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES trajopt_examples
-#  CATKIN_DEPENDS roscpp
-#  DEPENDS system_lib
-)
+catkin_package()
 
 include_directories(
 # include
@@ -34,19 +23,24 @@ include_directories(
 )
 
 add_executable(${PROJECT_NAME}_basic_cartesian_plan src/basic_cartesian_plan.cpp)
-target_link_libraries(${PROJECT_NAME}_basic_cartesian_plan ${PCL_LIBRARIES} ${catkin_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME}_basic_cartesian_plan ${PCL_LIBRARIES} ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME}_basic_cartesian_plan PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 add_executable(${PROJECT_NAME}_glass_up_right_plan src/glass_up_right_plan.cpp)
 target_link_libraries(${PROJECT_NAME}_glass_up_right_plan ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME}_glass_up_right_plan PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 add_executable(${PROJECT_NAME}_puzzle_piece_plan src/puzzle_piece_plan.cpp)
 target_link_libraries(${PROJECT_NAME}_puzzle_piece_plan ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME}_puzzle_piece_plan PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 add_executable(${PROJECT_NAME}_car_seat_demo src/car_seat_demo.cpp)
 target_link_libraries(${PROJECT_NAME}_car_seat_demo ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME}_car_seat_demo PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 add_executable(${PROJECT_NAME}_puzzle_piece_auxillary_axes_plan src/puzzle_piece_auxillary_axes_plan.cpp)
 target_link_libraries(${PROJECT_NAME}_puzzle_piece_auxillary_axes_plan ${catkin_LIBRARIES})
+target_compile_options(${PROJECT_NAME}_puzzle_piece_auxillary_axes_plan PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 # Mark executables and/or libraries for installation
 install(

diff --git a/trajopt_sco/CMakeLists.txt b/trajopt_sco/CMakeLists.txt
@@ -1,13 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(trajopt_sco)
 
-add_compile_options(
-  -std=c++11
-  -Wall
-  -Wextra
-  -Wsuggest-override
-  -Wconversion
-  -Wsign-conversion)
+add_compile_options(-std=c++11 -Wall -Wextra)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 find_package(catkin REQUIRED COMPONENTS trajopt_utils)
@@ -63,6 +57,7 @@ if (HAVE_BPMPD)
   endif()
 
   target_link_libraries(bpmpd_caller ${BPMPD_LIBRARY} -static)
+  target_compile_options(bpmpd_caller PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
   list(APPEND SCO_SOURCE_FILES src/bpmpd_interface.cpp)
   set_property(SOURCE src/bpmpd_interface.cpp APPEND PROPERTY COMPILE_DEFINITIONS BPMPD_CALLER="\\\"${CATKIN_DEVEL_PREFIX}/lib/${PROJECT_NAME}/bpmpd_caller\\\"")
@@ -110,6 +105,7 @@ endif()
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${JSONCPP_LIBRARIES})
 target_link_libraries(${PROJECT_NAME} PUBLIC ${SCO_LINK_LIBS})
+target_compile_options(${PROJECT_NAME} PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 # Mark executables and/or libraries for installation
 install(

diff --git a/trajopt_test_support/CMakeLists.txt b/trajopt_test_support/CMakeLists.txt
@@ -3,17 +3,9 @@ project(trajopt_test_support)
 
 find_package(catkin REQUIRED)
 
-catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES trajopt_test_support
-#  CATKIN_DEPENDS other_catkin_pkg
-#  DEPENDS system_lib
-)
+catkin_package()
 
-include_directories(
-# include
-# ${catkin_INCLUDE_DIRS}
-)
+include_directories()
 
 install(
   DIRECTORY config launch meshes urdf srdf

diff --git a/trajopt_tools/CMakeLists.txt b/trajopt_tools/CMakeLists.txt
@@ -1,49 +1,33 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(trajopt_tools)
 
-add_compile_options(
-  -std=c++11
-  -Wall
-  -Wextra
-  -Wsuggest-override
-  -Wconversion
-  -Wsign-conversion)
+add_compile_options(-std=c++11 -Wall -Wextra)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp
-  trajopt_ext
+  vhacd_ros
   bullet3_ros
   trajopt_utils
 )
 
-## Generate dynamic reconfigure parameters in the 'cfg' folder
-# generate_dynamic_reconfigure_options(
-#   cfg/DynReconf1.cfg
-#   cfg/DynReconf2.cfg
-# )
-
 catkin_package(
 #  INCLUDE_DIRS
 #  LIBRARIES
-  CATKIN_DEPENDS roscpp trajopt_ext bullet3_ros trajopt_utils
-#  DEPENDS system_lib
+  CATKIN_DEPENDS roscpp vhacd_ros bullet3_ros trajopt_utils
+#  DEPENDS
 )
 
-###########
-## Build ##
-###########
-
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
 include_directories(
   ${catkin_INCLUDE_DIRS}
 )
 
 add_executable(convex_decomposition_hacd_node src/convex_decomposition_hacd.cpp)
 target_link_libraries(convex_decomposition_hacd_node ${catkin_LIBRARIES})
+target_compile_options(convex_decomposition_hacd_node PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 add_executable(convex_decomposition_vhacd_node src/convex_decomposition_vhacd.cpp)
 target_link_libraries(convex_decomposition_vhacd_node ${catkin_LIBRARIES})
+target_compile_options(convex_decomposition_vhacd_node PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 # Mark executables and/or libraries for installation
 install(TARGETS convex_decomposition_hacd_node convex_decomposition_vhacd_node

diff --git a/trajopt_utils/CMakeLists.txt b/trajopt_utils/CMakeLists.txt
@@ -1,13 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(trajopt_utils)
 
-add_compile_options(
-  -std=c++11
-  -Wall
-  -Wextra
-  -Wsuggest-override
-  -Wconversion
-  -Wsign-conversion)
+add_compile_options(-std=c++11 -Wall -Wextra)
 
 find_package(catkin REQUIRED COMPONENTS)
 
@@ -38,6 +32,7 @@ include_directories(
 
 add_library(${PROJECT_NAME} ${UTILS_SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+target_compile_options(${PROJECT_NAME} PRIVATE -Wsuggest-override -Wconversion -Wsign-conversion)
 
 # Mark executables and/or libraries for installation
 install(TARGETS ${PROJECT_NAME}