[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3022-g2deff58

[Brad King]

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  2deff5839841562ad233357189bf7b0f5a408ee1 (commit)
       via  b882d62d2b4e612d2291a1c78562a18843a02189 (commit)
      from  d4e2c714a171c84609b174026d1f15f36f682cfc (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=2deff5839841562ad233357189bf7b0f5a408ee1
commit 2deff5839841562ad233357189bf7b0f5a408ee1
Merge: d4e2c71 b882d62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 8 09:49:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 8 09:49:49 2014 -0400

    Merge topic 'bug_0014849' into next
    
    b882d62d Tests: Fix FindPackageTest exported package version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b882d62d2b4e612d2291a1c78562a18843a02189
commit b882d62d2b4e612d2291a1c78562a18843a02189
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 8 09:48:21 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 8 09:48:21 2014 -0400

    Tests: Fix FindPackageTest exported package version
    
    Add a random version component so that the test is unlikely to conflict
    with other tests of the same CMake version on the same machine.

diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index 17f6b20..263f9a6 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -320,17 +320,23 @@ endif()
 
 #-----------------------------------------------------------------------------
 # Test export(PACKAGE) with find_package.
+
+# Choose a unique version.
+string(REGEX REPLACE "-.*$" "" version ${CMAKE_VERSION})
+string(RANDOM LENGTH 4 ALPHABET "0123456789" v)
+set(version "${version}.${v}")
+
 message(STATUS "Preparing export(PACKAGE) test project")
 try_compile(EXPORTER_COMPILED
   ${FindPackageTest_BINARY_DIR}/Exporter
   ${FindPackageTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-UCMAKE_EXPORT_NO_PACKAGE_REGISTRY"
+    -Dversion=${version}
   OUTPUT_VARIABLE output)
 message(STATUS "Searching for export(PACKAGE) test project")
 set(CMakeTestExportPackage_DIR "" CACHE FILEPATH
   "Wipe out find results for testing." FORCE)
-string(REGEX REPLACE "-.*$" "" version ${CMAKE_VERSION})
 find_package(CMakeTestExportPackage 1.${version} EXACT REQUIRED)
 
 message(STATUS "Searching for export(PACKAGE) test project with CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE")
@@ -355,6 +361,7 @@ try_compile(EXPORTER_COMPILED
   ${FindPackageTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE"
+    -Dversion=${version}
   OUTPUT_VARIABLE output)
 message(STATUS "Searching for export(PACKAGE) test project")
 find_package(CMakeTestExportPackage 1.${version} EXACT QUIET)
diff --git a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
index 42bd84e..6eac6e6 100644
--- a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
+++ b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
@@ -1,5 +1,5 @@
 # Test config file.
-set(PACKAGE_VERSION "1. at CMAKE_VERSION@")
+set(PACKAGE_VERSION "1. at version@")
 if("${PACKAGE_FIND_VERSION}" VERSION_EQUAL "${PACKAGE_VERSION}")
   set(PACKAGE_VERSION_COMPATIBLE 1)
   set(PACKAGE_VERSION_EXACT 1)

-----------------------------------------------------------------------

Summary of changes:
 Tests/FindPackageTest/CMakeLists.txt                          |    9 ++++++++-
 .../Exporter/CMakeTestExportPackageConfigVersion.cmake.in     |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake