[Cmake-commits] CMake branch, next, updated. v3.4.0-1392-g8913439

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8913439f0bd4fe8fb314ea86ea8fc6f48511609f (commit)
       via  716a09b913fa42eb50fe5039a39a26df58f70da7 (commit)
      from  03a3f24612e30d9df30bc30227febeb0977bbd7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8913439f0bd4fe8fb314ea86ea8fc6f48511609f
commit 8913439f0bd4fe8fb314ea86ea8fc6f48511609f
Merge: 03a3f24 716a09b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 17 12:07:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 17 12:07:36 2015 -0500

    Merge topic 'fix-compute-default-dialect-lto' into next
    
    716a09b9 Make C and C++ default dialect detection robust to advanced optimizations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716a09b913fa42eb50fe5039a39a26df58f70da7
commit 716a09b913fa42eb50fe5039a39a26df58f70da7
Author:     Setze Post <cmake at sietze.uk>
AuthorDate: Tue Nov 17 11:59:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 17 12:01:02 2015 -0500

    Make C and C++ default dialect detection robust to advanced optimizations
    
    In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
    for the compiler, 2015-09-15) we added an "INFO:..." string to the
    compiler id detection binary.  The value can be optimized out of the
    compiler id binary unless we force it to be included by making the
    program behavior depend on it at runtime.  Add references to the value
    as we do for the other info strings already.

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index b224007..63f8787 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+  require += info_language_dialect_default[argc];
   (void)argv;
   return require;
 }
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index d467507..61cd790 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+  require += info_language_dialect_default[argc];
   (void)argv;
   return require;
 }

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeCCompilerId.c.in     |    1 +
 Modules/CMakeCXXCompilerId.cpp.in |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake