[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5053-g55ec646

[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  55ec64678a04a4ec164427670e26933a9522fc48 (commit)
       via  9ae2666d55941758b0325119ee083210767a84c5 (commit)
      from  d0021bd26807e5900a686edfa9880561032560b3 (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=55ec64678a04a4ec164427670e26933a9522fc48
commit 55ec64678a04a4ec164427670e26933a9522fc48
Merge: d0021bd 9ae2666
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 11 14:07:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 11 14:07:38 2013 -0500

    Merge topic 'target_compile_features' into next
    
    9ae2666 Make this wok with spaces in the path.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ae2666d55941758b0325119ee083210767a84c5
commit 9ae2666d55941758b0325119ee083210767a84c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 11 20:05:43 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 11 20:05:43 2013 +0100

    Make this wok with spaces in the path.

diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index 0eb64be..37c9e6d 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -51,7 +51,7 @@ macro(__compiler_gnu lang)
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
   set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-  set(_CMAKE_${lang}_CREATE_OBJECT_FILE "${CMAKE_${lang}_COMPILER};<FLAGS>;-c;<SOURCE>")
+  set(_CMAKE_${lang}_CREATE_OBJECT_FILE "<FLAGS>;-c;<SOURCE>")
   if(NOT APPLE)
     set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
   endif()
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index a0f6d4c..3d59b7d 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -20,7 +20,8 @@ macro(record_compiler_features lang compile_flags feature_list)
 
   string(REPLACE "<FLAGS>" "${compile_flags}" _compile_object_command "${_CMAKE_${lang}_CREATE_OBJECT_FILE}" )
   string(REPLACE "<SOURCE>" "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" _compile_object_command "${_compile_object_command}" )
-  execute_process(COMMAND ${_compile_object_command}
+  execute_process(COMMAND "${CMAKE_${lang}_COMPILER}"
+    ${_compile_object_command}
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/CMakeFiles"
     ERROR_VARIABLE _error
     OUTPUT_VARIABLE _output
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 9646a54..53b439a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -246,7 +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}_CREATE_OBJECT_FILE "${CMAKE_CL_NOLOGO};/TP;<FLAGS>;-c;<SOURCE>")
 
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
   set(CMAKE_${lang}_LINK_EXECUTABLE

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

Summary of changes:
 Modules/Compiler/GNU.cmake            |    2 +-
 Modules/Internal/FeatureTesting.cmake |    3 ++-
 Modules/Platform/Windows-MSVC.cmake   |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake