[Cmake-commits] CMake branch, next, updated. v3.0.2-5676-gc14d30e
Brad King
brad.king at kitware.com
Wed Oct 8 10:37:16 EDT 2014
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 c14d30e8abfc303e3b655559ef673e60832576fc (commit)
via 741395f103d868ef9f7d1c2ac552c5eefcf729cc (commit)
from 6d4d4cf46cd2ed410ac1d434ba66d9f0a288e693 (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=c14d30e8abfc303e3b655559ef673e60832576fc
commit c14d30e8abfc303e3b655559ef673e60832576fc
Merge: 6d4d4cf 741395f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 8 10:37:15 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 8 10:37:15 2014 -0400
Merge topic 'rpath-osx-10_6' into next
741395f1 Tests: Use @rpath only on OS X 10.6 and greater
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=741395f103d868ef9f7d1c2ac552c5eefcf729cc
commit 741395f103d868ef9f7d1c2ac552c5eefcf729cc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 8 10:35:27 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 8 10:35:30 2014 -0400
Tests: Use @rpath only on OS X 10.6 and greater
The parent commit updated the implementation. Update the test too.
diff --git a/Tests/BundleUtilities/CMakeLists.txt b/Tests/BundleUtilities/CMakeLists.txt
index 3a1cf55..fb5e2cd 100644
--- a/Tests/BundleUtilities/CMakeLists.txt
+++ b/Tests/BundleUtilities/CMakeLists.txt
@@ -79,9 +79,9 @@ add_custom_target(testbundleutils2_test ALL
add_dependencies(testbundleutils2_test testbundleutils2)
-if(APPLE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 9.0)
+if(APPLE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 10.0)
###### Test a Bundle application using dependencies
-###### and @rpaths on Mac OS X 10.5 or greater
+###### and @rpaths on Mac OS X 10.6 or greater
# a shared library
add_library(shared-3 SHARED shared.cpp shared.h)
-----------------------------------------------------------------------
Summary of changes:
Tests/BundleUtilities/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list