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 ff01a61060dedea83dfba83bf636dabd85d89c61 (commit) via 36c509b9c23725a9e731b4f68a5bfb209bf3cfa1 (commit) via b8f194732f788bb1090437100efda7695295c279 (commit) from 05d793389215d5f80e7b4e444ecb1452250e6cbb (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=ff01a61060dedea83dfba83bf636dabd85d89c61 commit ff01a61060dedea83dfba83bf636dabd85d89c61 Merge: 05d7933 36c509b Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Tue Oct 7 00:31:58 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Oct 7 00:31:58 2014 -0400 Merge topic 'rpath-osx-10_6' into next 36c509b9 OSX: Only enable @rpath support on OS X 10.6 or greater. b8f19473 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36c509b9c23725a9e731b4f68a5bfb209bf3cfa1 commit 36c509b9c23725a9e731b4f68a5bfb209bf3cfa1 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Oct 6 22:24:10 2014 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Mon Oct 6 22:24:10 2014 -0600 OSX: Only enable @rpath support on OS X 10.6 or greater. Even though 10.5 supports @rpath, the support is not complete enough for CMake. For instance, install_name_tool doesn't support adding and removing rpaths. diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index e5c5f36..6a6b338 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.5 and greater where it is known to work. -if("${DARWIN_MAJOR_VERSION}" GREATER 8) +# Enable rpath support for 10.6 and greater where it is known to work. +if("${DARWIN_MAJOR_VERSION}" GREATER 9) set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") endif() diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b476a27..cc7d38b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3742,7 +3742,7 @@ bool cmTarget::HasMacOSXRpathInstallNameDir(const std::string& config) const } 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.5 or because CMake's platform configuration is"; + w << " less than 10.6 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/CMakeVersion.cmake | 2 +- Source/cmTarget.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits