Skip to content

Commit 6c25aeb

Browse files
committed
no redundant setting of c++ standard in cmake
1 parent 1a7512a commit 6c25aeb

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
option(BUILD_JSK_PKGS "Enable building of required components of jsk_recognition_msgs and jsk_rviz_plugins" ON)
2-
3-
if(BUILD_JSK_PKGS)
4-
add_subdirectory(include/jsk_recognition_msgs)
5-
# add_subdirectory(include/jsk_rviz_plugins) #TODO: allow building of rviz plugins as well
6-
endif()
7-
81
cmake_minimum_required(VERSION 3.0.2)
92
project(patchworkpp)
103

11-
add_compile_options(-std=c++17)
124
set(CMAKE_BUILD_TYPE "Release")
13-
14-
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD 17)
156
set(CMAKE_CXX_STANDARD_REQUIRED ON)
167
set(CMAKE_CXX_EXTENSIONS OFF)
178

9+
option(BUILD_JSK_PKGS "Enable building of required components of jsk_recognition_msgs and jsk_rviz_plugins" ON)
10+
if(BUILD_JSK_PKGS)
11+
add_subdirectory(include/jsk_recognition_msgs)
12+
# add_subdirectory(include/jsk_rviz_plugins) #TODO: allow building of rviz plugins as well
13+
endif()
14+
1815
find_package(catkin REQUIRED COMPONENTS
1916
roscpp
2017
rospy

0 commit comments

Comments
 (0)