Merging develop into master

SCOREC · Jun 14, 2018 · a6b4cbf · a6b4cbf
2 parents 250cbca + 676bf62
commit a6b4cbf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,8 @@ project(SCOREC VERSION 2.1.0 LANGUAGES CXX C)
 include(cmake/bob.cmake)
 include(cmake/xsdk.cmake)
 
+option(SCOREC_ENABLE_CXX11 "enable compilation with c++11 support" NO)
+
 option(USE_XSDK_DEFAULTS "enable the XDSK v0.3.0 default configuration" NO)
 
 xsdk_begin_package()
@@ -26,6 +28,9 @@ if(NOT USE_XSDK_DEFAULTS)
   bob_begin_cxx_flags()
   bob_end_cxx_flags()
   set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
+  if(SCOREC_ENABLE_CXX11)
+    bob_cxx11_flags()
+  endif()
 endif()
 message(STATUS "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")