[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3083-gb087322

[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  b087322a2bf2b640e307842a7fd413243be702a0 (commit)
       via  c876914c6d98221cc1800fbf1ee6b006df672658 (commit)
      from  f4f59f4b1e1a40e1f63afc4bfc53dd4ceb265f2e (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=b087322a2bf2b640e307842a7fd413243be702a0
commit b087322a2bf2b640e307842a7fd413243be702a0
Merge: f4f59f4 c876914
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 9 11:45:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 9 11:45:30 2014 -0400

    Merge topic 'bug_0014849' into next
    
    c876914c Tests: Fix FindPackageTest for in-source builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c876914c6d98221cc1800fbf1ee6b006df672658
commit c876914c6d98221cc1800fbf1ee6b006df672658
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 9 11:43:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 9 11:45:44 2014 -0400

    Tests: Fix FindPackageTest for in-source builds
    
    Use a different directory name for the Exporter build tree so that it is
    out-of-source even when the main test is in-source.

diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index 263f9a6..092bf20 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -328,7 +328,7 @@ set(version "${version}.${v}")
 
 message(STATUS "Preparing export(PACKAGE) test project")
 try_compile(EXPORTER_COMPILED
-  ${FindPackageTest_BINARY_DIR}/Exporter
+  ${FindPackageTest_BINARY_DIR}/Exporter-build
   ${FindPackageTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-UCMAKE_EXPORT_NO_PACKAGE_REGISTRY"
@@ -350,14 +350,14 @@ endif()
 unset(CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY)
 
 message(STATUS "Remove export(PACKAGE) test project")
-file(REMOVE_RECURSE ${FindPackageTest_BINARY_DIR}/Exporter)
+file(REMOVE_RECURSE ${FindPackageTest_BINARY_DIR}/Exporter-build)
 set(CMakeTestExportPackage_DIR "" CACHE FILEPATH
   "Wipe out find results for testing." FORCE)
 find_package(CMakeTestExportPackage QUIET) # Should clean the user package cache
 #
 message(STATUS "Preparing export(PACKAGE) test project with CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE")
 try_compile(EXPORTER_COMPILED
-  ${FindPackageTest_BINARY_DIR}/Exporter
+  ${FindPackageTest_BINARY_DIR}/Exporter-build
   ${FindPackageTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE"

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

Summary of changes:
 Tests/FindPackageTest/CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake