[Cmake-commits] CMake branch, next, updated. v2.8.11-2369-gd6c6a71

[Clinton Stimpson]

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  d6c6a71afc5ecffe9314a677ed099b55a9117588 (commit)
       via  175ae56e7bc6abd58319f8620239276f54c8c492 (commit)
      from  7c4018ef8c52e89fc95062d9c0c09053a59949df (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=d6c6a71afc5ecffe9314a677ed099b55a9117588
commit d6c6a71afc5ecffe9314a677ed099b55a9117588
Merge: 7c4018e 175ae56
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri May 31 00:16:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 31 00:16:50 2013 -0400

    Merge topic 'rpath-on-mac' into next
    
    175ae56 OS X: enable rpath support on 10.5.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=175ae56e7bc6abd58319f8620239276f54c8c492
commit 175ae56e7bc6abd58319f8620239276f54c8c492
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu May 30 22:15:36 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu May 30 22:15:36 2013 -0600

    OS X: enable rpath support on 10.5.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 3719ddc..f0652b9 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -30,8 +30,8 @@ set(CMAKE_SHARED_MODULE_SUFFIX ".so")
 set(CMAKE_MODULE_EXISTS 1)
 set(CMAKE_DL_LIBS "")
 
-# Enable rpath support for 10.6 and greater where it is known to work.
-if("${DARWIN_MAJOR_VERSION}" GREATER 9)
+# Enable rpath support for 10.5 and greater where it is known to work.
+if("${DARWIN_MAJOR_VERSION}" GREATER 8)
   set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
 endif()
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 75d9f01..ea718ae 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3867,7 +3867,7 @@ bool cmTarget::HasMacOSXRpath(const char* config)
       }
     w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
     w << "  This could be because you are using a Mac OS X version";
-    w << " less than 10.6 or because CMake's platform configuration is";
+    w << " less than 10.5 or because CMake's platform configuration is";
     w << " corrupt.";
     cmake* cm = this->Makefile->GetCMakeInstance();
     cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());

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

Summary of changes:
 Modules/Platform/Darwin.cmake |    4 ++--
 Source/cmTarget.cxx           |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake