diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-05-12 15:02:13 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-06-05 14:44:25 +0200 |
| commit | 03ebfb08cd13346ca76ebf4264f41abb692afd02 (patch) | |
| tree | 09f00eee0ffbd9ee1cad705f09e762e1d3623f34 | |
| parent | 015d1298cb8f853cc4b0cae6a62c13af130791b7 (diff) | |
bump CMAKE_CXX_STANDARD
| -rw-r--r-- | cmake/opentrack-platform.cmake | 4 | ||||
| -rw-r--r-- | cv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-aruco/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-easy/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 005f8a4b..fd82c1b5 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -38,8 +38,8 @@ set(opentrack_maintainer-mode FALSE CACHE INTERNAL "Select if developing core co set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_DEFAULT 17) +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_DEFAULT 20) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt index d5f33d44..3a8798cc 100644 --- a/cv/CMakeLists.txt +++ b/cv/CMakeLists.txt @@ -4,7 +4,7 @@ if(OpenCV_FOUND) try_compile(cv_use-ipp "${CMAKE_CURRENT_BINARY_DIR}" SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ocv-check.cxx" CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${OpenCV_INCLUDE_DIRS}" - "-DCXX_STANDARD=17" "-DCXX_STANDARD_REQUIRED=1" + "-DCXX_STANDARD=20" "-DCXX_STANDARD_REQUIRED=1" OUTPUT_VARIABLE krap) otr_module(cv STATIC) target_link_libraries(${self} opencv_core opentrack-video) diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt index c477ac1e..333edb3e 100644 --- a/tracker-aruco/CMakeLists.txt +++ b/tracker-aruco/CMakeLists.txt @@ -31,7 +31,7 @@ if(OpenCV_FOUND) try_compile(tracker-aruco_has-working-abi "${CMAKE_CURRENT_BINARY_DIR}" SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/compile-test/abi.cpp" CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${dir}" - "-DCXX_STANDARD=17" "-DCXX_STANDARD_REQUIRED=1" + "-DCXX_STANDARD=20" "-DCXX_STANDARD_REQUIRED=1" OUTPUT_VARIABLE krap) if(NOT tracker-aruco_has-working-abi) message(FATAL_ERROR "${krap}\n" "Must use Aruco fork from <https://github.com/opentrack/aruco>") diff --git a/tracker-easy/CMakeLists.txt b/tracker-easy/CMakeLists.txt index d4dcdca9..ff537877 100644 --- a/tracker-easy/CMakeLists.txt +++ b/tracker-easy/CMakeLists.txt @@ -5,7 +5,7 @@ if(OpenCV_FOUND) try_compile(tracker-easy_ocv-check "${CMAKE_CURRENT_BINARY_DIR}" SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ocv-check.cxx" CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${OpenCV_INCLUDE_DIRS}" - "-DCXX_STANDARD=17" "-DCXX_STANDARD_REQUIRED=1" + "-DCXX_STANDARD=20" "-DCXX_STANDARD_REQUIRED=1" OUTPUT_VARIABLE krap) if(tracker-easy_ocv-check) foreach(k highgui videoio imgcodecs imgproc calib3d video features2d flann) |