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 e5734b5b08b7e5e6376b332d9de121aa6bb38282 (commit) via de80d7318f7e525fc4d91f85b8ee8a4345c60d53 (commit) from 4585ef7db51d87f5082b30308bbc86c7ed8e387f (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=e5734b5b08b7e5e6376b332d9de121aa6bb38282 commit e5734b5b08b7e5e6376b332d9de121aa6bb38282 Merge: 4585ef7 de80d73 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Oct 8 12:12:48 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Oct 8 12:12:48 2014 -0400 Merge topic 'rpath-osx-10_6' into next de80d731 OSX: Better warning message when rpaths can't be changed at install time. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de80d7318f7e525fc4d91f85b8ee8a4345c60d53 commit de80d7318f7e525fc4d91f85b8ee8a4345c60d53 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Oct 8 10:11:59 2014 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Wed Oct 8 10:11:59 2014 -0600 OSX: Better warning message when rpaths can't be changed at install time. diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 1cb5b0f..d689c89 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -677,19 +677,20 @@ cmInstallTargetGenerator return; } - if(this->Target->GetMakefile()->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) + cmMakefile* mf = this->Target->GetMakefile(); + + if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) { // If using install_name_tool, set up the rules to modify the rpaths. std::string installNameTool = - this->Target->GetMakefile()-> - GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL"); + mf->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL"); std::vector<std::string> oldRuntimeDirs, newRuntimeDirs; cli->GetRPath(oldRuntimeDirs, false); cli->GetRPath(newRuntimeDirs, true); std::string darwin_major_version_s = - this->Target->GetMakefile()->GetSafeDefinition("DARWIN_MAJOR_VERSION"); + mf->GetSafeDefinition("DARWIN_MAJOR_VERSION"); std::stringstream ss(darwin_major_version_s); int darwin_major_version; @@ -702,8 +703,10 @@ cmInstallTargetGenerator msg << "WARNING: Target \"" << this->Target->GetName() << "\" has runtime paths which cannot be changed during install. " << "To change runtime paths, OS X version 10.6 or newer is required. " - << "Therefore, runtime paths will not be changed when installing."; - cmSystemTools::Message(msg.str().c_str(), "Warning"); + << "Therefore, runtime paths will not be changed when installing. " + << "CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around" + " this limitation."; + mf->IssueMessage(cmake::WARNING, msg.str()); } else { @@ -714,7 +717,7 @@ cmInstallTargetGenerator i != oldRuntimeDirs.end(); ++i) { std::string runpath = - this->Target->GetMakefile()->GetLocalGenerator()-> + mf->GetLocalGenerator()-> GetGlobalGenerator()->ExpandCFGIntDir(*i, config); if(runpaths.find(runpath) == runpaths.end()) @@ -731,7 +734,7 @@ cmInstallTargetGenerator i != newRuntimeDirs.end(); ++i) { std::string runpath = - this->Target->GetMakefile()->GetLocalGenerator()-> + mf->GetLocalGenerator()-> GetGlobalGenerator()->ExpandCFGIntDir(*i, config); if(runpaths.find(runpath) == runpaths.end()) ----------------------------------------------------------------------- Summary of changes: Source/cmInstallTargetGenerator.cxx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits