[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1657-ge78eac2

[Ben Boeckel]

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  e78eac2e9a7af33b7cc81015c7e87b317e40da7f (commit)
       via  6a9ed3ccd92e0d00c505a913642df73b26faf507 (commit)
      from  44d5818a6ae24364e1ddccda23b1b15ffad2e3e1 (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=e78eac2e9a7af33b7cc81015c7e87b317e40da7f
commit e78eac2e9a7af33b7cc81015c7e87b317e40da7f
Merge: 44d5818 6a9ed3c
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 18 14:27:27 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 18 14:27:27 2013 -0500

    Merge topic 'dev/osx-flags' into next
    
    6a9ed3c Revert "Add rpath support for clang"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a9ed3ccd92e0d00c505a913642df73b26faf507
commit 6a9ed3ccd92e0d00c505a913642df73b26faf507
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 18 14:27:11 2013 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 18 14:27:11 2013 -0500

    Revert "Add rpath support for clang"
    
    This reverts commit 877f30541da9075dec97cbe76aab13e1ca4a51f0.

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