[Cmake-commits] CMake branch, next, updated. v3.3.1-2849-g92875bd

[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  92875bd700ec97b97a2b5ab8137e56a69d8774c2 (commit)
       via  150e1b27c54cf4e19e19ad7836e6bbfb9fbb5266 (commit)
      from  b5e1777f2ca44ee1de0f24cdf5551abc6f3db60c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92875bd700ec97b97a2b5ab8137e56a69d8774c2
commit 92875bd700ec97b97a2b5ab8137e56a69d8774c2
Merge: b5e1777 150e1b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 14:43:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 10 14:43:11 2015 -0400

    Merge topic 'compiler-features-robustness' into next
    
    150e1b27 Features: Extract strings from test binary more reliably (#15736)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=150e1b27c54cf4e19e19ad7836e6bbfb9fbb5266
commit 150e1b27c54cf4e19e19ad7836e6bbfb9fbb5266
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 14:37:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 10 14:41:05 2015 -0400

    Features: Extract strings from test binary more reliably (#15736)
    
    Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for
    recording CXX compiler features, 2013-10-17) we compile a test source to
    a binary and then extract "<LANG>_FEATURES:..." strings from the binary
    with the file(STRINGS) command.  Add a newline at the beginning of the
    string literal to be sure file(STRINGS) can extract the first entry as a
    string independent of whatever else the compiler may put before the
    storage it allocates for the literal within the binary.

diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index abd9a26..86b89b2 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -5,7 +5,7 @@ macro(record_compiler_features lang compile_flags feature_list)
   string(TOLOWER ${lang} lang_lc)
   file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.bin")
   file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "
-  const char features[] = {\"\"\n")
+  const char features[] = {\"\\n\"\n")
 
   get_property(known_features GLOBAL PROPERTY CMAKE_${lang}_KNOWN_FEATURES)
 

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

Summary of changes:
 Modules/Internal/FeatureTesting.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake