Merge pull request #46 from mshabunin/fix-cpp-standard

build: do not force CXX standard
opencv · Oct 21, 2024 · ffc83ad · ffc83ad
2 parents 6482886 + aa2002a
commit ffc83ad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,10 @@ option(FORCE_ADE_ASSERTS       "Always enable ADE_ASSERT"         OFF)
 option(BUILD_ADE_DOCUMENTATION "Build doxygen documentation"      OFF)
 option(BUILD_WITH_STATIC_CRT   "Build with static multi-threaded C Runtime (MS Windows/Visual Studio only)" OFF)
 
-set(CMAKE_CXX_STANDARD 11)
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
 
 # TODO: this is horrible hack, we must follow cmake
 # build/install policy