Set C++ standard to 14 (#37)
* Bump CMake version to 3.7.2 Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Set C++ standard to 14 Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
This commit is contained in:
parent
9f04c48a15
commit
24597c2130
|
@ -1,7 +1,10 @@
|
||||||
cmake_minimum_required(VERSION 3.0.2)
|
cmake_minimum_required(VERSION 3.7.2)
|
||||||
|
|
||||||
project(kdl_parser)
|
project(kdl_parser)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
find_package(catkin QUIET
|
find_package(catkin QUIET
|
||||||
COMPONENTS rosconsole cmake_modules
|
COMPONENTS rosconsole cmake_modules
|
||||||
)
|
)
|
||||||
|
@ -35,8 +38,6 @@ endif()
|
||||||
|
|
||||||
include_directories(include ${orocos_kdl_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS} ${TinyXML2_INCLUDE_DIRS})
|
include_directories(include ${orocos_kdl_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS} ${TinyXML2_INCLUDE_DIRS})
|
||||||
|
|
||||||
add_compile_options(-std=c++11)
|
|
||||||
|
|
||||||
if(catkin_FOUND)
|
if(catkin_FOUND)
|
||||||
link_directories(${catkin_LIBRARY_DIRS})
|
link_directories(${catkin_LIBRARY_DIRS})
|
||||||
include_directories(${catkin_INCLUDE_DIRS})
|
include_directories(${catkin_INCLUDE_DIRS})
|
||||||
|
|
Loading…
Reference in New Issue