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 036182dd9c03db921115d8baf6adafff7b2c1233 (commit)
via de1493176b936e960165d9110944636bcb9fd798 (commit)
from 2e27da53ac949ff3944933adb4e55b368e708b17 (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=036182dd9c03db921115d8baf6adafff7b2c1233
commit 036182dd9c03db921115d8baf6adafff7b2c1233
Merge: 2e27da5 de14931
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 15 08:41:33 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 15 08:41:33 2016 -0400
Merge topic 'update-kwsys' into next
de149317 Tests: Use upper-case drive letters in
RunCMake.get_filename_component
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de1493176b936e960165d9110944636bcb9fd798
commit de1493176b936e960165d9110944636bcb9fd798
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 15 08:32:43 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Sep 15 08:39:18 2016 -0400
Tests: Use upper-case drive letters in RunCMake.get_filename_component
With the most recent KWSys update, the "actual case" operation on
Windows always upper-cases the drive letter now even for absolute paths
that do not exist. Use an upper-case drive letter in the test so that
it can tolerate this operation on Windows and the lack of this operation
elsewhere.
diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index d822258..7dfb55d 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -19,12 +19,12 @@ foreach(c DIRECTORY NAME EXT NAME_WE PATH)
endforeach()
# Test Windows paths with DIRECTORY component and an absolute Windows path.
-get_filename_component(test_slashes "c:\\path\\to\\filename.ext.in" DIRECTORY)
-check("DIRECTORY from backslashes" "${test_slashes}" "c:/path/to")
+get_filename_component(test_slashes "C:\\path\\to\\filename.ext.in" DIRECTORY)
+check("DIRECTORY from backslashes" "${test_slashes}" "C:/path/to")
list(APPEND non_cache_vars test_slashes)
-get_filename_component(test_winroot "c:\\filename.ext.in" DIRECTORY)
-check("DIRECTORY in windows root" "${test_winroot}" "c:/")
+get_filename_component(test_winroot "C:\\filename.ext.in" DIRECTORY)
+check("DIRECTORY in windows root" "${test_winroot}" "C:/")
list(APPEND non_cache_vars test_winroot)
# Test finding absolute paths.
@@ -33,8 +33,8 @@ 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_absolute "C:/../path/to/filename.ext.in" ABSOLUTE)
+check("ABSOLUTE .. in windows root" "${test_absolute}"
"C:/path/to/filename.ext.in")
list(APPEND non_cache_vars test_absolute)
-----------------------------------------------------------------------
Summary of changes:
.../RunCMake/get_filename_component/KnownComponents.cmake | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
