[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1655-g44d5818

Ben Boeckel ben.boeckel at kitware.com
Fri Jan 18 13:32:36 EST 2013


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  44d5818a6ae24364e1ddccda23b1b15ffad2e3e1 (commit)
       via  697c786656d7891dea5d32cc22036260970818a4 (commit)
       via  877f30541da9075dec97cbe76aab13e1ca4a51f0 (commit)
      from  737e1d4e3570ec49682e4007452ecbf443adb2be (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=44d5818a6ae24364e1ddccda23b1b15ffad2e3e1
commit 44d5818a6ae24364e1ddccda23b1b15ffad2e3e1
Merge: 737e1d4 697c786
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 18 13:32:35 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 18 13:32:35 2013 -0500

    Merge topic 'dev/osx-flags' into next
    
    697c786 The -isystem flag work on Apple machines
    877f305 Add rpath support for clang


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=697c786656d7891dea5d32cc22036260970818a4
commit 697c786656d7891dea5d32cc22036260970818a4
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 18 13:30:47 2013 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 18 13:30:47 2013 -0500

    The -isystem flag work on Apple machines

diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index faad416..e36b795 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -48,7 +48,5 @@ 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>")
-  if(NOT APPLE)
-    set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
-  endif()
+  set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
 endmacro()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=877f30541da9075dec97cbe76aab13e1ca4a51f0
commit 877f30541da9075dec97cbe76aab13e1ca4a51f0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 18 13:30:33 2013 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 18 13:30:33 2013 -0500

    Add rpath support for clang

diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 75a971d..91be8bf 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -23,4 +23,6 @@ include(Compiler/GNU)
 macro(__compiler_clang lang)
   __compiler_gnu(${lang})
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Xlinker -rpath -Xlinker ")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP "")
 endmacro()

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

Summary of changes:
 Modules/Compiler/Clang.cmake |    2 ++
 Modules/Compiler/GNU.cmake   |    4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list