mirror of
https://github.com/moveit/moveit_task_constructor.git
synced 2025-09-27 00:29:13 +08:00
Modernize: require cmake version 3.1.3
This commit is contained in:
parent
5d4cf640ef
commit
bc25c5e3c1
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(moveit_task_constructor_capabilities)
|
||||
|
||||
add_compile_options(-std=c++14)
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(moveit_task_constructor_core)
|
||||
|
||||
find_package(Boost REQUIRED)
|
||||
@ -27,16 +27,11 @@ catkin_package(
|
||||
visualization_msgs
|
||||
)
|
||||
|
||||
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
|
||||
add_compile_options(-std=c++14)
|
||||
else ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
|
||||
# check for MOVEIT_MASTER
|
||||
include(CheckIncludeFileCXX)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${moveit_core_INCLUDE_DIRS})
|
||||
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||
CHECK_INCLUDE_FILE_CXX(moveit/collision_detection/collision_env.h MOVEIT_MASTER)
|
||||
if(NOT MOVEIT_MASTER)
|
||||
set(MOVEIT_MASTER 0)
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(moveit_task_constructor_demo)
|
||||
|
||||
add_compile_options(-std=c++14)
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(moveit_task_constructor_msgs)
|
||||
|
||||
set(MSG_DEPS moveit_msgs visualization_msgs)
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(rviz_marker_tools)
|
||||
|
||||
find_package(catkin REQUIRED COMPONENTS
|
||||
@ -20,11 +20,7 @@ catkin_package(
|
||||
rviz
|
||||
)
|
||||
|
||||
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
|
||||
add_compile_options(-std=c++14)
|
||||
else ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
|
||||
set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME})
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
cmake_minimum_required(VERSION 3.1.3)
|
||||
project(moveit_task_constructor_visualization)
|
||||
|
||||
find_package(catkin REQUIRED COMPONENTS
|
||||
@ -46,11 +46,7 @@ catkin_package(
|
||||
rviz
|
||||
)
|
||||
|
||||
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
|
||||
add_compile_options(-std=c++14)
|
||||
else ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif ()
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
|
||||
add_subdirectory(visualization_tools)
|
||||
add_subdirectory(motion_planning_tasks)
|
||||
|
Loading…
Reference in New Issue
Block a user