It is now possible to disable CXX11 support.

Author: Roberto Di Remigio

CMakeLists.txt

@@ -17,6 +17,7 @@ option(DISABLE_EIGEN_OWN       "Do not use Eigen3 headers shipped with the modul
 option(ENABLE_EIGEN_MKL        "Enable Eigen3 automatic fallback to some of Intel MKL algorithms" OFF)
 option(ENABLE_PYTHON_EMBEDDING "Enable Python embedding"                                          ON)
 option(ENABLE_64BIT_INTEGERS   "Enable 64-bit integers"                                           OFF)
+option(ENABLE_CXX11_SUPPORT    "Enable C++11 compiler support"                                    ON)
 #
 #  CMake modules
 #
@@ -30,14 +31,14 @@ set(CMAKE_MODULE_PATH
 set(header_dir_list)
 set(libs_to_merge)
 
+include(ConfigSafeGuards)
 include(ConfigVersion)
 include(ConfigArchitecture)
-include(CheckCXX11Features)
+include(CheckIncludeFile)
 include(ConfigCompilerFlags)
 include(PerTargetCompilerFlags)
 include(ConfigDocumentation)
 include(ConfigExternal)
-include(ConfigSafeGuards)
 include(GenericMacros)
 include(ConfigGitRevision) # Has to come after ConfigVersion.cmake
 include(MergeStaticLibs)
@@ -288,3 +289,6 @@ endif()
 # This is the very last thing we do, i.e. DO NOT add anything depending on this target!!!
 merge_static_libs(pcm "${libs_to_merge}")
 install(TARGETS pcm ARCHIVE DESTINATION lib)
+
+# Printout useful info
+include(ConfigInfo)

cmake/ConfigInfo.cmake

@@ -0,0 +1,10 @@
+message("-- System                : ${CMAKE_SYSTEM_NAME}")
+message("-- Processor type        : ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+message("-- C++ compiler flags    : ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${cmake_build_type_toupper}} ${CXX_ARCHITECTURE_FLAGS}")
+message("-- C compiler flags      : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${cmake_build_type_toupper}} ${C_ARCHITECTURE_FLAGS}")
+message("-- Fortran compiler flags: ${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${cmake_build_type_toupper}} ${Fortran_ARCHITECTURE_FLAGS}")
+message("-- Libraries             : ${EXTERNAL_LIBS}")
+
+get_directory_property(LIST_OF_DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
+message("-- Definitions           : ${LIST_OF_DEFINITIONS}")
+unset(LIST_OF_DEFINITIONS)

cmake/ConfigSafeGuards.cmake

@@ -1,17 +1,19 @@
 
 # guard against in-source builds
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-  message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ")
+    message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there.")
 endif()
 
 # guard against bad build-type strings
-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Debug")
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+string(TOUPPER "${CMAKE_BUILD_TYPE}" cmake_build_type_toupper)
 if(    NOT cmake_build_type_tolower STREQUAL "debug"
    AND NOT cmake_build_type_tolower STREQUAL "release"
+   AND NOT cmake_build_type_tolower STREQUAL "profile"
    AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
-  message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+      message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, Profile, RelWithDebInfo (case-insensitive).")
 endif()

cmake/compilers/ConfigCompilerFlags.cmake

@@ -1,18 +1,24 @@
 include(SaveCompilerFlags)
-include(FindBrokenIntrinsics)
-include(OptimizeForArchitecture)
+if(ENABLE_CXX11_SUPPORT)
+   include(CheckCXX11Features)
+endif()   
+include(CheckCXXCompilerFlag)
+include(CheckCCompilerFlag)
+include(CheckFortranCompilerFlag)
 
 if(ENABLE_VECTORIZATION)
-	set(DEFINITIONS)
-	set(CXX_ARCHITECTURE_FLAGS)
-	set(C_ARCHITECTURE_FLAGS)
-	set(Fortran_ARCHITECTURE_FLAGS)
-	find_broken_intrinsics()
-	OptimizeForArchitecture()
-	message(STATUS "Vectorization flags used:")
-	message(STATUS "  CXX:     ${CXX_ARCHITECTURE_FLAGS}")
-	message(STATUS "  C:       ${C_ARCHITECTURE_FLAGS}")
-	message(STATUS "  Fortran: ${Fortran_ARCHITECTURE_FLAGS}")
+   include(FindBrokenIntrinsics)
+   include(OptimizeForArchitecture)
+   set(DEFINITIONS)
+   set(CXX_ARCHITECTURE_FLAGS)
+   set(C_ARCHITECTURE_FLAGS)
+   set(Fortran_ARCHITECTURE_FLAGS)
+   find_broken_intrinsics()
+   OptimizeForArchitecture()
+   message(STATUS "Vectorization flags used:")
+   message(STATUS "  CXX:     ${CXX_ARCHITECTURE_FLAGS}")
+   message(STATUS "  C:       ${C_ARCHITECTURE_FLAGS}")
+   message(STATUS "  Fortran: ${Fortran_ARCHITECTURE_FLAGS}")
 endif()	
 
 if(CMAKE_C_COMPILER_WORKS)

setup

@@ -153,6 +153,10 @@ def parse_input():
             action='store_true',
             default=False,
             help='disable Python embedding (requires Python development package) [default: %(default)s]')
+    group.add_argument('--disable_cxx11',
+            action='store_true',
+            default=False,
+            help='disable C++11 support [default: %(default)s]')
     group.add_argument('-D',
             action="append",
             dest='define',
@@ -272,6 +276,7 @@ def gen_cmake_command(args):
     command += ' -DENABLE_EIGEN_MKL=%s'        % translate_cmake(args.eigenmkl)
     command += ' -DENABLE_VECTORIZATION=%s'    % translate_cmake(args.vectorization)
     command += ' -DENABLE_PYTHON_EMBEDDING=%s' % translate_cmake(not args.disable_python_embedding)
+    command += ' -DENABLE_CXX11_SUPPORT=%s'    % translate_cmake(not args.disable_cxx11)
 #   command += ' -DENABLE_STATIC_LINKING=%s' % translate_cmake(args.static)
 
     if args.blas == 'builtin':