Better CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79f45f4..557ee57 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,23 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
 project(roboticsgroup_gazebo_plugins)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED COMPONENTS 
-  roscpp 
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
   gazebo_ros
   control_toolbox
 )
 
 # Depend on system install of Gazebo
 find_package(gazebo REQUIRED)
-if(${GAZEBO_MAJOR_VERSION} GREATER "5")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-endif()
+# Gazebo cxx flags should have all the required C++ flags
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
 
 find_package(Boost REQUIRED)
 
 catkin_package(
-  DEPENDS 
-    roscpp 
+  DEPENDS
+    roscpp
     gazebo_ros
     control_toolbox
 )
@@ -31,4 +30,3 @@ target_link_libraries(roboticsgroup_gazebo_mimic_joint_plugin ${catkin_LIBRARIES
 
 add_library(roboticsgroup_gazebo_disable_link_plugin src/disable_link_plugin.cpp)
 target_link_libraries(roboticsgroup_gazebo_disable_link_plugin ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
-