added an option to specify CMAKE_CXX_STANDARD

nolden · May 2, 2017 · 961cc82 · 961cc82
1 parent 1127a37
commit 961cc82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 3.5.0)
 
+if(NOT DCMQI_CMAKE_CXX_STANDARD)
+  set(DCMQI_CMAKE_CXX_STANDARD 98)
+endif()
+set(CMAKE_CXX_STANDARD ${DCMQI_CMAKE_CXX_STANDARD})
+
 set(DCMQI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
 
 #-----------------------------------------------------------------------------

diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -64,6 +64,7 @@ foreach(varname IN ITEMS GIT_EXECUTABLE Subversion_SVN_EXECUTABLE)
     list(APPEND DCMQI_EP_CMAKE_CACHE_ARGS -D${varname}:FILEPATH=${${varname}})
   endif()
 endforeach()
+list(APPEND DCMQI_EP_CMAKE_CACHE_ARGS -DCMAKE_CXX_STANDARD:STRING=${DCMQI_CMAKE_CXX_STANDARD})
 
 ExternalProject_Add(${proj}
   ${${proj}_EP_ARGS}