[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5801-ga0177ea

[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  a0177ea15e1e39f69a15ab81b3a9555847b0e98f (commit)
       via  89ba7b0046622eec7cdf44b64f666ce6e79d94f0 (commit)
      from  507731c4d6c3bfc027e5efa0c3f0672c4dca2770 (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=a0177ea15e1e39f69a15ab81b3a9555847b0e98f
commit a0177ea15e1e39f69a15ab81b3a9555847b0e98f
Merge: 507731c 89ba7b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 25 17:02:19 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 17:02:19 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    89ba7b0 Update the Clang pattern to specify compiler options.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ba7b0046622eec7cdf44b64f666ce6e79d94f0
commit 89ba7b0046622eec7cdf44b64f666ce6e79d94f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 27 12:58:58 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 25 23:01:21 2013 +0100

    Update the Clang pattern to specify compiler options.
    
    In Clang 3.4, the preferred (and new) option pattern is --target=.
    
     http://thread.gmane.org/gmane.comp.compilers.clang.devel/29975
     http://llvm.org/viewvc/llvm-project?view=revision&revision=184408
    
    Clang 3.4 is not yet released, but there is a release candidate, and
    there is a dashboard test of Clang trunk.

diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 055aad6..eeba119 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -30,7 +30,12 @@ else()
     set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
     set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
     set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
-    set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-target ")
-    set(CMAKE_${lang}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN "-gcc-toolchain ")
+    if(CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.4.0)
+      set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-target ")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN "-gcc-toolchain ")
+    else()
+      set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "--target=")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN "--gcc-toolchain=")
+    endif()
   endmacro()
 endif()

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

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


hooks/post-receive
-- 
CMake