Fix build when USE_CXX_STANDARD is used

fspindle · Nov 4, 2023 · 1ea1366 · 1ea1366
1 parent b917d6e
commit 1ea1366
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/cmake/VISPDetectCXXStandard.cmake b/cmake/VISPDetectCXXStandard.cmake
@@ -8,12 +8,27 @@ if(DEFINED USE_CXX_STANDARD)
   if(USE_CXX_STANDARD STREQUAL "11")
     set(CMAKE_CXX_STANDARD 11)
     set(VISP_CXX_STANDARD ${VISP_CXX_STANDARD_11})
+    vp_check_compiler_flag(CXX "-std=c++11" HAVE_STD_CXX11_FLAG "${PROJECT_SOURCE_DIR}/cmake/checks/cxx11.cpp")
+    if(HAVE_STD_CXX11_FLAG)
+      set(CXX11_CXX_FLAGS "-std=c++11" CACHE STRING "C++ compiler flags for C++11 support")
+      mark_as_advanced(HAVE_STD_CXX11_FLAG)
+    endif()
   elseif(USE_CXX_STANDARD STREQUAL "14")
     set(CMAKE_CXX_STANDARD 14)
     set(VISP_CXX_STANDARD ${VISP_CXX_STANDARD_14})
+    vp_check_compiler_flag(CXX "-std=c++14" HAVE_STD_CXX14_FLAG "${PROJECT_SOURCE_DIR}/cmake/checks/cxx14.cpp")
+    if(HAVE_STD_CXX14_FLAG)
+      set(CXX14_CXX_FLAGS "-std=c++14" CACHE STRING "C++ compiler flags for C++14 support")
+      mark_as_advanced(HAVE_STD_CXX14_FLAG)
+    endif()
   elseif(USE_CXX_STANDARD STREQUAL "17")
     set(CMAKE_CXX_STANDARD 17)
     set(VISP_CXX_STANDARD ${VISP_CXX_STANDARD_17})
+    vp_check_compiler_flag(CXX "-std=c++17" HAVE_STD_CXX17_FLAG "${PROJECT_SOURCE_DIR}/cmake/checks/cxx17.cpp")
+    if(HAVE_STD_CXX17_FLAG)
+      set(CXX17_CXX_FLAGS "-std=c++17" CACHE STRING "C++ compiler flags for C++17 support")
+      mark_as_advanced(HAVE_STD_CXX17_FLAG)
+    endif()
   endif()
 
   set(CMAKE_CXX_EXTENSIONS OFF) # use -std=c++11 instead of -std=gnu++11