[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3164-ge8f8000

[Stephen Kelly]

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  e8f8000289ea812e8f97d58940bbec218c34e4ac (commit)
       via  c2baaa06f3bad8a789105c1b359e6c858a5473ed (commit)
      from  1f9e5a16a8592115386d1d0ea9419c43648095db (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=e8f8000289ea812e8f97d58940bbec218c34e4ac
commit e8f8000289ea812e8f97d58940bbec218c34e4ac
Merge: 1f9e5a1 c2baaa0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 15 13:37:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 15 13:37:09 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    c2baaa06 Use the static string in the presence of optimization.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2baaa06f3bad8a789105c1b359e6c858a5473ed
commit c2baaa06f3bad8a789105c1b359e6c858a5473ed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 15 19:36:33 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 15 19:36:33 2014 +0200

    Use the static string in the presence of optimization.

diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index bea1cfa..abd9a26 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -20,7 +20,7 @@ macro(record_compiler_features lang compile_flags feature_list)
     endif()
   endforeach()
   file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
-    "\n};\n\nint main() { (void)features; return 0; }\n")
+    "\n};\n\nint main(int argc, char** argv) { (void)argv; return features[argc]; }\n")
 
   try_compile(CMAKE_${lang}_FEATURE_TEST
     ${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"

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

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


hooks/post-receive
-- 
CMake