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 5354df72e26ce7e8180d9b6a17b2374689c67790 (commit)
via d26800bc40a103d90366da176ad68ed92f21daab (commit)
from d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (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=5354df72e26ce7e8180d9b6a17b2374689c67790
commit 5354df72e26ce7e8180d9b6a17b2374689c67790
Merge: d8586e0 d26800b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 09:16:37 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 4 09:16:37 2013 -0400
Merge topic 'fix-path-root-dot-dot' into next
d26800b get_filename_component: Test ABSOLUTE of .. after root component
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d26800bc40a103d90366da176ad68ed92f21daab
commit d26800bc40a103d90366da176ad68ed92f21daab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 11:17:20 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 09:09:22 2013 -0400
get_filename_component: Test ABSOLUTE of .. after root component
Teach the RunCMake.get_filename_component test to verify that ".." does
not remove the root filename component.
diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index a4ef8ff..9d7cf90 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -24,6 +24,11 @@ check("DIRECTORY in windows root" "${test_winroot}" "c:/")
get_filename_component(test_absolute "/path/to/a/../filename.ext.in" ABSOLUTE)
check("ABSOLUTE" "${test_absolute}" "/path/to/filename.ext.in")
+get_filename_component(test_absolute "/../path/to/filename.ext.in" ABSOLUTE)
+check("ABSOLUTE .. in root" "${test_absolute}" "/path/to/filename.ext.in")
+get_filename_component(test_absolute "c:/../path/to/filename.ext.in" ABSOLUTE)
+check("ABSOLUTE .. in windows root" "${test_absolute}"
"c:/path/to/filename.ext.in")
+
get_filename_component(test_cache "/path/to/filename.ext.in" DIRECTORY CACHE)
check("CACHE 1" "${test_cache}" "/path/to")
get_filename_component(test_cache "/path/to/other/filename.ext.in" DIRECTORY
CACHE)
-----------------------------------------------------------------------
Summary of changes:
.../get_filename_component/KnownComponents.cmake | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
