[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5048-g5721bb1

[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  5721bb16e15f2fb68d94b4419c689fd18d130a01 (commit)
       via  729aafc7288c595928678252970e9f05c0ecb214 (commit)
      from  b4d28a43f8b94b4610f81b9694589b23b715555f (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=5721bb16e15f2fb68d94b4419c689fd18d130a01
commit 5721bb16e15f2fb68d94b4419c689fd18d130a01
Merge: b4d28a4 729aafc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 11 04:16:37 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 11 04:16:37 2013 -0500

    Merge topic 'target_compile_features' into next
    
    729aafc Fix build on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=729aafc7288c595928678252970e9f05c0ecb214
commit 729aafc7288c595928678252970e9f05c0ecb214
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 11 10:16:00 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 11 10:16:00 2013 +0100

    Fix build on Windows.

diff --git a/Modules/Platform/Windows-MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
similarity index 100%
rename from Modules/Platform/Windows-MSVC-CXX-FeatureTests.cmake
rename to Modules/Compiler/MSVC-CXX-FeatureTests.cmake
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index 992cc49..5bb7ddb 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${CMAKE_${lang}_OUTPUT_EXTENSION}")
   file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.${lang_lc}" "
-  extern const char features[] = {\n")
+  extern const char features[] = {\"\"\n")
   foreach(feature ${CMAKE_${lang}_KNOWN_FEATURES})
     if (_cmake_feature_test_${feature})
       if (${_cmake_feature_test_${feature}} STREQUAL 1)
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index e29aaf4..9646a54 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -246,6 +246,7 @@ macro(__windows_compiler_msvc lang)
     "<CMAKE_${lang}_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}")
   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE
     "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}")
+  set(_CMAKE_${lang}_CREATE_OBJECT_FILE "${CMAKE_${lang}_COMPILER};${CMAKE_CL_NOLOGO};/TP;<FLAGS>;-c;<SOURCE>")
 
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
   set(CMAKE_${lang}_LINK_EXECUTABLE

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

Summary of changes:
 .../MSVC-CXX-FeatureTests.cmake}                   |    0
 Modules/Internal/FeatureTesting.cmake              |    2 +-
 Modules/Platform/Windows-MSVC.cmake                |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)
 rename Modules/{Platform/Windows-MSVC-CXX-FeatureTests.cmake => Compiler/MSVC-CXX-FeatureTests.cmake} (100%)


hooks/post-receive
-- 
CMake