[Cmake-commits] CMake branch, next, updated. v2.8.4-1442-g139d284
Brad King
brad.king at kitware.com
Thu Apr 14 09:37:11 EDT 2011
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 139d284c4454fbccbc5c1ef84a9170b259a56e39 (commit)
via 08b93977cffacc53f2c5b405f781efd035240175 (commit)
from 2567f7c0f308ac7e06a21c77a35ed29f7e889097 (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=139d284c4454fbccbc5c1ef84a9170b259a56e39
commit 139d284c4454fbccbc5c1ef84a9170b259a56e39
Merge: 2567f7c 08b9397
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 09:37:10 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 14 09:37:10 2011 -0400
Merge topic 'find_package-system-registry' into next
08b9397 find_package: Fix system package registry test path conversion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08b93977cffacc53f2c5b405f781efd035240175
commit 08b93977cffacc53f2c5b405f781efd035240175
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 09:35:21 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 14 09:35:21 2011 -0400
find_package: Fix system package registry test path conversion
Do not use file(TO_NATIVE_PATH) to compute the value to store in the
registry. It is meant for constructing values to be put in shells.
Since find_package() can use the value with CMake-normalized slashes do
not bother with any conversion.
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index 9ac9eee..89383a0 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -42,7 +42,7 @@ FIND_PACKAGE(VersionTestD 1.2.3.4)
SET(CMakeTestSystemPackage "")
IF(WIN32 AND NOT CYGWIN)
# Try writing a value to the system package registry.
- FILE(TO_NATIVE_PATH "${FindPackageTest_SOURCE_DIR}/SystemPackage" _data)
+ SET(_data "${FindPackageTest_SOURCE_DIR}/SystemPackage")
SET(_key "HKLM\\Software\\Kitware\\CMake\\Packages\\CMakeTestSystemPackage")
SET(_file "${FindPackageTest_BINARY_DIR}/CMakeTestSystemPackage.data")
FILE(WRITE ${_file} "${_data}\n")
-----------------------------------------------------------------------
Summary of changes:
Tests/FindPackageTest/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list