diff --git a/gazebo_grasp_plugin/CMakeLists.txt b/gazebo_grasp_plugin/CMakeLists.txt index 03d7dfac7a3e0238ba67dc3117b9d294d8440abb..1af7d3efd33043edd3046cd3ba7bf54feda25f59 100644 --- a/gazebo_grasp_plugin/CMakeLists.txt +++ b/gazebo_grasp_plugin/CMakeLists.txt @@ -31,12 +31,23 @@ catkin_package( INCLUDE_DIRS include LIBRARIES gazebo_grasp_fix CATKIN_DEPENDS gazebo_ros geometry_msgs roscpp std_msgs - DEPENDS gazebo + DEPENDS gazebo_ros ) ########### ## Build ## ########### +# check c++11 / c++0x +include(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) +if(COMPILER_SUPPORTS_CXX11) + set(CMAKE_CXX_FLAGS "-std=c++11") +elseif(COMPILER_SUPPORTS_CXX0X) + set(CMAKE_CXX_FLAGS "-std=c++0x") +else() + message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ") +endif() ## Specify additional locations of header files ## Your package locations should be listed before other locations diff --git a/gazebo_state_plugins/CMakeLists.txt b/gazebo_state_plugins/CMakeLists.txt index 93a7ac3668fb450f6fa51cd1207863de237fa447..807ecdec7515161d5be82e2fc3d17c2e0b4a255f 100644 --- a/gazebo_state_plugins/CMakeLists.txt +++ b/gazebo_state_plugins/CMakeLists.txt @@ -40,12 +40,23 @@ catkin_package( LIBRARIES gazebo_state_plugins gazebo_map_publisher CATKIN_DEPENDS geometry_msgs roscpp shape_msgs std_msgs nav_msgs gazebo_world_plugin_loader gazebo_ros object_msgs object_msgs_tools eigen_conversions - DEPENDS gazebo + DEPENDS gazebo_ros ) ########### ## Build ## ########### +# check c++11 / c++0x +include(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) +if(COMPILER_SUPPORTS_CXX11) + set(CMAKE_CXX_FLAGS "-std=c++11") +elseif(COMPILER_SUPPORTS_CXX0X) + set(CMAKE_CXX_FLAGS "-std=c++0x") +else() + message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ") +endif() ## Specify additional locations of header files ## Your package locations should be listed before other locations diff --git a/gazebo_test_tools/CMakeLists.txt b/gazebo_test_tools/CMakeLists.txt index b06cca081d762859b6b9f3b29a65ca906098e55e..9dbbc908646ff54ec17d79a066dd6a5663731a41 100644 --- a/gazebo_test_tools/CMakeLists.txt +++ b/gazebo_test_tools/CMakeLists.txt @@ -64,7 +64,7 @@ catkin_package( INCLUDE_DIRS include LIBRARIES gazebo_test_tools CATKIN_DEPENDS object_msgs gazebo_ros geometry_msgs roscpp std_msgs message_runtime - DEPENDS gazebo + DEPENDS gazebo_ros ) ########### diff --git a/gazebo_world_plugin_loader/CMakeLists.txt b/gazebo_world_plugin_loader/CMakeLists.txt index 6098e7fc6615df58a5491a36d4d177f2ffe21aad..962a331cf4d5338797bd0c58ace0bcbe6b77f802 100644 --- a/gazebo_world_plugin_loader/CMakeLists.txt +++ b/gazebo_world_plugin_loader/CMakeLists.txt @@ -5,7 +5,7 @@ project(gazebo_world_plugin_loader) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages find_package( - catkin + catkin REQUIRED COMPONENTS roscpp gazebo_ros @@ -31,12 +31,24 @@ catkin_package( INCLUDE_DIRS include LIBRARIES gazebo_world_plugin_loader CATKIN_DEPENDS roscpp gazebo_ros - DEPENDS gazebo + DEPENDS gazebo_ros ) ########### ## Build ## ########### +# check c++11 / c++0x +include(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) +if(COMPILER_SUPPORTS_CXX11) + set(CMAKE_CXX_FLAGS "-std=c++11") +elseif(COMPILER_SUPPORTS_CXX0X) + set(CMAKE_CXX_FLAGS "-std=c++0x") +else() + message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ") +endif() + ## Specify additional locations of header files ## Your package locations should be listed before other locations