[Cmake-commits] CMake branch, next, updated. v3.4.0-1396-gc5c1a66

[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  c5c1a6691e47b765755567023b930c0456019f90 (commit)
       via  c3dc8935ee5fe9415d37ec138b6c087f85f15d43 (commit)
      from  e720b5f39b594f48e4c0f1b2133e071c63009431 (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=c5c1a6691e47b765755567023b930c0456019f90
commit c5c1a6691e47b765755567023b930c0456019f90
Merge: e720b5f c3dc893
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 18 10:13:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 18 10:13:49 2015 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3dc8935ee5fe9415d37ec138b6c087f85f15d43
commit c3dc8935ee5fe9415d37ec138b6c087f85f15d43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 18 10:12:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 18 10:12:25 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.
    
    Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744

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:


hooks/post-receive
-- 
CMake