[Cmake-commits] CMake branch, next, updated. v2.8.12-4467-g89bc83d

[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  89bc83d8c9e8dad80037c32828dcf5d933a5726f (commit)
       via  7bbdc639213db6d7378b0bee6248b66346771624 (commit)
      from  38e66d96191064c0d0348b4915fedf09300e898f (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=89bc83d8c9e8dad80037c32828dcf5d933a5726f
commit 89bc83d8c9e8dad80037c32828dcf5d933a5726f
Merge: 38e66d9 7bbdc63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 10:58:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 10:58:17 2013 -0400

    Merge topic 'target_compiler_features' into next
    
    7bbdc63 Add a variable for the compiler command to compile a source file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bbdc639213db6d7378b0bee6248b66346771624
commit 7bbdc639213db6d7378b0bee6248b66346771624
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 16:57:16 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 16:57:16 2013 +0200

    Add a variable for the compiler command to compile a source file.
    
    Use the variable in CxxFeatureTesting.cmake.

diff --git a/Modules/Compiler/CxxFeatureTesting.cmake b/Modules/Compiler/CxxFeatureTesting.cmake
index e15ea21..0f4ee8c 100644
--- a/Modules/Compiler/CxxFeatureTesting.cmake
+++ b/Modules/Compiler/CxxFeatureTesting.cmake
@@ -13,7 +13,9 @@ macro(record_cxx_compiler_features compile_flags feature_list)
   endforeach()
   file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.cxx" "\n};\n")
 
-  execute_process(COMMAND "${CMAKE_CXX_COMPILER}" ${compile_flags} "-c" "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.cxx"
+  string(REPLACE "<FLAGS>" "${compile_flags}" _compile_object_command "${_CMAKE_CXX_CREATE_OBJECT_FILE}" )
+  string(REPLACE "<SOURCE>" "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.cxx" _compile_object_command "${_compile_object_command}" )
+  execute_process(COMMAND ${_compile_object_command}
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/CMakeFiles"
     RESULT_VARIABLE _result
     OUTPUT_VARIABLE _output
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index 504704d..0eb64be 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -51,6 +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>")
   if(NOT APPLE)
     set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
   endif()
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 1eda76e..58c264a 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -12,6 +12,7 @@ endif()
 
 set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
+set(_CMAKE_CXX_CREATE_OBJECT_FILE "${CMAKE_CXX_COMPILER};<FLAGS>;-c;<SOURCE>")
 
 set(CMAKE_CXX11_COMPILER_FEATURES)
 
diff --git a/Modules/Compiler/XL-CXX.cmake b/Modules/Compiler/XL-CXX.cmake
index 706b789..31bae0a 100644
--- a/Modules/Compiler/XL-CXX.cmake
+++ b/Modules/Compiler/XL-CXX.cmake
@@ -9,6 +9,7 @@ set(CMAKE_CXX_FLAGS_INIT "-qthreaded -qhalt=e")
 
 set(CMAKE_CXX_COMPILE_OBJECT
   "<CMAKE_CXX_COMPILER> -+ <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
+set(_CMAKE_CXX_CREATE_OBJECT_FILE "${CMAKE_CXX_COMPILER};<FLAGS>;-c;<SOURCE>")
 
 set(CMAKE_CXX11_COMPILER_FEATURES)
 

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

Summary of changes:
 Modules/Compiler/CxxFeatureTesting.cmake |    4 +++-
 Modules/Compiler/GNU.cmake               |    1 +
 Modules/Compiler/Intel-CXX.cmake         |    1 +
 Modules/Compiler/XL-CXX.cmake            |    1 +
 4 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake