Changeset 3036 for trunk

Timestamp:

04/01/15 20:51:15 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-7383)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap build

Description: Darrell's addition to CXX11 flag.

File:

• trunk/CMakeLists.txt (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -7 +7 @@
 
 # options
+option (CXX11 "Compile as C++11 if possible" NO)
+
 option( USE_LIBCASACORE 
         "set ON to use libcasacore.so instead of libcasa_*.so"
@@ -108 +110 @@
 if( HAS_GCC_FORTRAN_RULES )
      set( CMAKE_C_FLAGS "-fcx-fortran-rules ${CMAKE_C_FLAGS}" )
+endif()
+
+# Detect if the compiler supports C++11 if we want to use it.
+if (CXX11)
+    if ((CMAKE_COMPILER_IS_GNUCXX AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.6) OR
+       (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.3))
+        set(DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -std=c++11 -DCXX11")
+    else()
+        option(CXX11 "" NO)
+    endif()
 endif()