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 aababf9947a4e35ee708c40f2b9146bbf8f887a2 (commit) via 98d20316bdf701865a3e3c4df7d378917224b8b0 (commit) from 35e2dbd8a62f825e84e944523bfa527be0780e7a (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=aababf9947a4e35ee708c40f2b9146bbf8f887a2 commit aababf9947a4e35ee708c40f2b9146bbf8f887a2 Merge: 35e2dbd 98d2031 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Sat Jan 21 00:03:39 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Jan 21 00:03:39 2012 -0500 Merge topic 'GetPrerequisites-rpath-OSX' into next 98d2031 Fix BundleUtilities test failure with space in build path. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98d20316bdf701865a3e3c4df7d378917224b8b0 commit 98d20316bdf701865a3e3c4df7d378917224b8b0 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Jan 20 22:02:01 2012 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Jan 20 22:02:01 2012 -0700 Fix BundleUtilities test failure with space in build path. diff --git a/Tests/BundleUtilities/CMakeLists.txt b/Tests/BundleUtilities/CMakeLists.txt index efbf152..8f24afe 100644 --- a/Tests/BundleUtilities/CMakeLists.txt +++ b/Tests/BundleUtilities/CMakeLists.txt @@ -106,7 +106,7 @@ if(APPLE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 9.0) # a loadable module (depends on shared2) # testbundleutils1 will load this at runtime add_library(module3 MODULE module.cpp module.h) - set_target_properties(module3 PROPERTIES PREFIX "" LINK_FLAGS "-Wl,-rpath,${CMAKE_CURRENT_BINARY_DIR}/testdir3") + set_target_properties(module3 PROPERTIES PREFIX "" LINK_FLAGS "-Wl,-rpath,@loader_path/") get_target_property(module_loc module3 LOCATION) target_link_libraries(module3 shared2-3) @@ -116,7 +116,7 @@ if(APPLE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 9.0) get_target_property(loc testbundleutils3 LOCATION) set_target_properties(testbundleutils3 module3 PROPERTIES - LINK_FLAGS "-Wl,-rpath,${CMAKE_CURRENT_BINARY_DIR}/testdir3") + LINK_FLAGS "-Wl,-rpath,@loader_path/") # add custom target to install and test the app add_custom_target(testbundleutils3_test ALL ----------------------------------------------------------------------- Summary of changes: Tests/BundleUtilities/CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits