[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2590-g826cea1

[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  826cea1d4761c9a59d0a62a2cad25541250979e4 (commit)
       via  d2e5c66173f638a95d57bba25af7f0ba11efcd1d (commit)
      from  81141da33ec6e72f5bc4a5ebc9f6628731e9450e (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=826cea1d4761c9a59d0a62a2cad25541250979e4
commit 826cea1d4761c9a59d0a62a2cad25541250979e4
Merge: 81141da d2e5c66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 08:41:01 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 11 08:41:01 2013 -0400

    Merge topic 'COMPILER_TARGET' into next
    
    d2e5c66 Fix some bugs in the parent commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2e5c66173f638a95d57bba25af7f0ba11efcd1d
commit d2e5c66173f638a95d57bba25af7f0ba11efcd1d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 14:34:10 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 11 14:34:10 2013 +0200

    Fix some bugs in the parent commit.

diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake
index 6b11237..44cc04a 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,11 +28,8 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
       set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
     endif()
-    if(CMAKE_C_COMPILER_TARGET)
-      set(CMAKE_FLAGS "-DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}")
-    endif()
-    if(CMAKE_CXX_COMPILER_TARGET)
-      set(CMAKE_FLAGS "-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}")
+    if(CMAKE_${lang}_COMPILER_TARGET)
+      set(CMAKE_FLAGS "${CMAKE_FLAGS} -DCMAKE_${lang}_COMPILER_TARGET=${CMAKE_${lang}_COMPILER_TARGET}")
     endif()
     try_compile(CMAKE_${lang}_ABI_COMPILED
       ${CMAKE_BINARY_DIR} ${src}
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 2299b38..66b00bd 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -26,5 +26,4 @@ macro(__compiler_clang lang)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
   set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
   set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ")
-  set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ")
 endmacro()

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

Summary of changes:
 Modules/CMakeDetermineCompilerABI.cmake |    7 ++-----
 Modules/Compiler/Clang.cmake            |    1 -
 2 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake