[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4958-g47947ad

[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  47947adae9786b9ffae31d69dc452ac804e7bbb2 (commit)
       via  66ae759296e69a25a739024abe2635fdfaf6dd43 (commit)
      from  814bb0f9a87c03f10b884007242c30dc45cb06ca (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=47947adae9786b9ffae31d69dc452ac804e7bbb2
commit 47947adae9786b9ffae31d69dc452ac804e7bbb2
Merge: 814bb0f 66ae759
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 9 06:41:28 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 9 06:41:28 2013 -0500

    Merge topic 'cmake-internal-locations' into next
    
    66ae759 bootstrap: No ctest or cpack is available to CMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66ae759296e69a25a739024abe2635fdfaf6dd43
commit 66ae759296e69a25a739024abe2635fdfaf6dd43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 9 06:36:49 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 9 06:37:43 2013 -0500

    bootstrap: No ctest or cpack is available to CMake
    
    Do not set CMAKE_(CTEST|CPACK)_COMMAND while bootstrapping CMake
    because the tools do not exist.  This avoids making the CMake.Install
    test depend on a non-existent ctest.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c3f9d69..8bde300 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -936,12 +936,14 @@ int cmake::AddCMakePaths()
   this->CacheManager->AddCacheEntry
     ("CMAKE_COMMAND", cmSystemTools::GetCMakeCommand().c_str(),
      "Path to CMake executable.", cmCacheManager::INTERNAL);
+#ifdef CMAKE_BUILD_WITH_CMAKE
   this->CacheManager->AddCacheEntry
     ("CMAKE_CTEST_COMMAND", cmSystemTools::GetCTestCommand().c_str(),
      "Path to ctest program executable.", cmCacheManager::INTERNAL);
   this->CacheManager->AddCacheEntry
     ("CMAKE_CPACK_COMMAND", cmSystemTools::GetCPackCommand().c_str(),
      "Path to cpack program executable.", cmCacheManager::INTERNAL);
+#endif
   // if the edit command is not yet in the cache,
   // or if CMakeEditCommand has been set on this object,
   // then set the CMAKE_EDIT_COMMAND in the cache

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

Summary of changes:
 Source/cmake.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake