Automatic snapshot commit from tribits at fd1f66e

Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' At commit: commit 6e3d7d2be883b43cbc4dacf27e083f0283ec01b8 Author: Roscoe A. Bartlett <[email protected]> Date: Thu Nov 9 19:39:57 2017 -0700 Summary: Define <Project>_C_Standard as cache var and document (#239)
trilinos · Nov 10, 2017 · e8ab9eb · e8ab9eb
1 parent 5e47efd
commit e8ab9eb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/cmake/tribits/core/package_arch/TribitsDefineStandardCompileVars.cmake b/cmake/tribits/core/package_arch/TribitsDefineStandardCompileVars.cmake
@@ -94,9 +94,14 @@ MACRO(TRIBITS_DEFINE_STANDARD_COMPILE_FLAGS_VARS  ENABLE_SHADOWING_WARNINGS)
   IF (${PROJECT_NAME}_C_STRONG_COMPILE_WARNING_FLAGS)
     SET(C_STRONG_COMPILE_WARNING_FLAGS ${${PROJECT_NAME}_C_STRONG_COMPILE_WARNING_FLAGS})
   ELSE()
+    IF ("${${PROJECT_NAME}_C_Standard}" STREQUAL "")
+      SET(${PROJECT_NAME}_C_Standard_USED c99)
+    ELSE()
+      SET(${PROJECT_NAME}_C_Standard_USED ${${PROJECT_NAME}_C_Standard})
+    ENDIF()
     MULTILINE_SET(C_STRONG_COMPILE_WARNING_FLAGS
       ${COMMON_STRONG_COMPILE_WARNING_FLAGS}
-      " -std=c99" # Check for C99
+      " -std=${${PROJECT_NAME}_C_Standard_USED}"
       )
   ENDIF()
 

diff --git a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake
@@ -222,6 +222,14 @@ MACRO(TRIBITS_DEFINE_GLOBAL_OPTIONS_AND_DEFINE_EXTRA_REPOS)
     "Enable the C compiler and related code"
     ${${PROJECT_NAME}_ENABLE_C_DEFAULT} )
 
+  IF ("${${PROJECT_NAME}_C_Standard_DEFAULT}" STREQUAL "")
+    SET(${PROJECT_NAME}_C_Standard_DEFAULT c99)
+  ENDIF()
+  ADVANCED_SET(${PROJECT_NAME}_C_Standard
+    ${${PROJECT_NAME}_C_Standard_DEFAULT}
+    CACHE STRING
+    "The standard <cstd> to use in --std=<cstd> for GCC compilers." )
+
   IF ("${${PROJECT_NAME}_ENABLE_CXX_DEFAULT}" STREQUAL "")
     SET(${PROJECT_NAME}_ENABLE_CXX_DEFAULT ON)
   ENDIF()

diff --git a/cmake/tribits/doc/developers_guide/TribitsDevelopersGuide.rst b/cmake/tribits/doc/developers_guide/TribitsDevelopersGuide.rst
@@ -7811,6 +7811,7 @@ be documented in `TribitsBuildReference`_.
 The global project-level TriBITS options for which defaults can be provided by
 a given TriBITS project are:
 
+* `${PROJECT_NAME}_C_Standard`_
 * `${PROJECT_NAME}_CHECK_FOR_UNPARSED_ARGUMENTS`_
 * `${PROJECT_NAME}_CONFIGURE_OPTIONS_FILE_APPEND`_
 * `${PROJECT_NAME}_CPACK_SOURCE_GENERATOR`_
@@ -7842,9 +7843,19 @@ a given TriBITS project are:
 * `MPI_EXEC_MAX_NUMPROCS`_
 * `PythonInterp_FIND_VERSION`_
 
-
 These options are described below.
 
+.. _${PROJECT_NAME}_C_Standard:
+
+**${PROJECT_NAME}_C_Standard**
+
+  The variable ``${PROJECT_NAME}_C_Standard`` is used define the C standard
+  pass to the compiler in ``--std=<cstd>`` for GCC builds of the project.
+  TriBITS sets the default as ``c99`` but the project can set a new default in
+  the project's base `<projectDir>/CMakeLists.txt`_ file with, for example::
+
+    SET(${PROJECT_NAME}_C_Standard_DEFAULT c11)
+
 .. _${PROJECT_NAME}_CHECK_FOR_UNPARSED_ARGUMENTS:
 
 **${PROJECT_NAME}_CHECK_FOR_UNPARSED_ARGUMENTS**