[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-720-gdcb743e
Brad King
brad.king at kitware.com
Thu Mar 2 08:28:02 EST 2017
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 dcb743e3f68638141d4c81f653a82b9082135f3f (commit)
via 604da06269a3a5e4d37d0bccdf1fc91378ddb9b4 (commit)
from 25dc8c09860498aaba135aed5a05fa3b55b304d0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcb743e3f68638141d4c81f653a82b9082135f3f
commit dcb743e3f68638141d4c81f653a82b9082135f3f
Merge: 25dc8c0 604da06
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 08:28:01 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 2 08:28:01 2017 -0500
Merge topic 'implicit-dir-symlinks' into next
604da062 fixup! Tests: Add case for RPATH exclusion of symlinks to implicit directories
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=604da06269a3a5e4d37d0bccdf1fc91378ddb9b4
commit 604da06269a3a5e4d37d0bccdf1fc91378ddb9b4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 08:25:48 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 2 08:25:48 2017 -0500
fixup! Tests: Add case for RPATH exclusion of symlinks to implicit directories
diff --git a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
index 7115011..b0ede70 100644
--- a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
+++ b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
@@ -5,14 +5,18 @@
to the file:
- .*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/exe
+ [^
+]*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/exe
The current (RPATH|RUNPATH) is:
- .*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/libAlways
+ [^
+]*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/libAlways(:[^
+]*)?
which does not contain:
- .*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/libLink
+ [^
+]*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/libLink
as was expected\.$
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list