Skip to content

Commit 77a135a

Browse files
committed
all: Make C++14 required for all packages
Even if this isn't necessary for some packages, not specifying any standard leads to compilation errors on some compilers, so we use C++14 as default for consistency. The alternative would have been to use C++11 and C++14.
1 parent bf02981 commit 77a135a

File tree

14 files changed

+49
-3
lines changed

14 files changed

+49
-3
lines changed

engine/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ if(BuildTests)
5050
add_executable(${test-libstack}
5151
src/stack_test.cpp
5252
)
53+
set_target_properties(${test-libstack} PROPERTIES
54+
CXX_STANDARD 14
55+
CXX_STANDARD_REQUIRED ON
56+
)
5357
target_link_libraries(${test-libstack}
5458
CONAN_PKG::gtest
5559
CONAN_PKG::boost
@@ -71,6 +75,7 @@ add_executable(${target}
7175
)
7276
set_target_properties(${target} PROPERTIES
7377
CXX_STANDARD 14
78+
CXX_STANDARD_REQUIRED ON
7479
OUTPUT_NAME ${output}
7580
)
7681
target_compile_definitions(${target}

fable/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ if(BuildTests)
6363
src/fable/schema/optional_test.cpp
6464
src/fable/schema_test.cpp
6565
)
66+
set_target_properties(test-fable PROPERTIES
67+
CXX_STANDARD 14
68+
CXX_STANDARD_REQUIRED ON
69+
)
6670
target_link_libraries(test-fable
6771
CONAN_PKG::gtest
6872
CONAN_PKG::boost

models/CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,23 @@ if(BuildTests)
4646
enable_testing()
4747
include(GoogleTest)
4848

49-
add_executable(test_models
49+
add_executable(test-models
5050
# find src -type f -name "*_test.cpp"
5151
src/cloe/component/latlong_actuator_test.cpp
5252
src/cloe/utility/actuation_level_test.cpp
5353
)
54-
target_link_libraries(test_models
54+
set_target_properties(test-models PROPERTIES
55+
CXX_STANDARD 14
56+
CXX_STANDARD_REQUIRED ON
57+
)
58+
target_link_libraries(test-models
5559
PRIVATE
5660
CONAN_PKG::gtest
5761
CONAN_PKG::boost
5862
CONAN_PKG::cloe-runtime
5963
${target}
6064
)
61-
gtest_add_tests(TARGET test_models)
65+
gtest_add_tests(TARGET test-models)
6266
endif()
6367

6468
# Installation -------------------------------------------------------

oak/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ if(BuildTests)
4646
# find src -type f -name "*_test.cpp"
4747
src/oak/route_muxer_test.cpp
4848
)
49+
set_target_properties(test-oak PROPERTIES
50+
CXX_STANDARD 14
51+
CXX_STANDARD_REQUIRED ON
52+
)
4953
target_link_libraries(test-oak
5054
CONAN_PKG::gtest
5155
CONAN_PKG::boost

plugins/basic/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}
@@ -52,6 +54,10 @@ if(BuildTests)
5254
add_executable(test-basic-controller
5355
src/hmi_contact_test.cpp
5456
)
57+
set_target_properties(test-basic-controller PROPERTIES
58+
CXX_STANDARD 14
59+
CXX_STANDARD_REQUIRED ON
60+
)
5561
target_link_libraries(test-basic-controller
5662
PRIVATE
5763
CONAN_PKG::gtest

plugins/demo_printer/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/demo_stuck/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/gndtruth_extractor/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/minimator/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/noisy_object_sensor/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/speedometer/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/virtue/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ message(STATUS "-> Building ${output} module.")
2121
add_library(${target} MODULE ${sources})
2222
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
2323
set_target_properties(${target} PROPERTIES
24+
CXX_STANDARD 14
25+
CXX_STANDARD_REQUIRED ON
2426
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
2527
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
2628
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}

plugins/vtd/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ target_sources(${target}
4040
set(cloe_lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/cloe)
4141
set_target_properties(${target} PROPERTIES
4242
CXX_STANDARD 14
43+
CXX_STANDARD_REQUIRED ON
4344
ARCHIVE_OUTPUT_DIRECTORY ${cloe_lib_dir}
4445
LIBRARY_OUTPUT_DIRECTORY ${cloe_lib_dir}
4546
RUNTIME_OUTPUT_DIRECTORY ${cloe_lib_dir}
@@ -96,6 +97,10 @@ if(BuildTests)
9697
src/osi_test.cpp
9798
src/vtd_osi_test.cpp
9899
)
100+
set_target_properties(test-vtd-binding PROPERTIES
101+
CXX_STANDARD 14
102+
CXX_STANDARD_REQUIRED ON
103+
)
99104
target_include_directories(test-vtd-binding
100105
PRIVATE
101106
${VTD_INCLUDE_DIRS}

runtime/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ if(BuildTests)
7272
src/cloe/utility/statistics_test.cpp
7373
src/cloe/utility/uid_tracker_test.cpp
7474
)
75+
set_target_properties(test-cloe PROPERTIES
76+
CXX_STANDARD 14
77+
CXX_STANDARD_REQUIRED ON
78+
)
7579
target_link_libraries(test-cloe
7680
PRIVATE
7781
CONAN_PKG::gtest

0 commit comments

Comments
 (0)