[Cmake-commits] CMake branch, next, updated. v2.8.3-748-g36f1176

David Cole david.cole at kitware.com
Mon Dec 6 08:58:37 EST 2010


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  36f117641d689e8c2a19308d6a0ade7b9aaa5eae (commit)
       via  a2a997d8c479e2b0a56354ef107239f550117c44 (commit)
      from  8f51affdab8d6d6df4c80cf782e0003bb26f8ee5 (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=36f117641d689e8c2a19308d6a0ade7b9aaa5eae
commit 36f117641d689e8c2a19308d6a0ade7b9aaa5eae
Merge: 8f51aff a2a997d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 6 08:58:32 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 6 08:58:32 2010 -0500

    Merge topic 'fix-typo-in-error-message' into next
    
    a2a997d Correct misspelling in error message text.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2a997d8c479e2b0a56354ef107239f550117c44
commit a2a997d8c479e2b0a56354ef107239f550117c44
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 6 08:44:26 2010 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 6 08:44:26 2010 -0500

    Correct misspelling in error message text.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 2baacbf..c8374db 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -341,7 +341,7 @@ bool cmCacheManager::LoadCache(const char* path,
         std::string("The current CMakeCache.txt directory ") +
         currentcwd + std::string(" is different than the directory ") +
         std::string(this->GetCacheValue("CMAKE_CACHEFILE_DIR")) +
-        std::string(" where CMackeCache.txt was created. This may result "
+        std::string(" where CMakeCache.txt was created. This may result "
                     "in binaries being created in the wrong place. If you "
                     "are not sure, reedit the CMakeCache.txt");
       cmSystemTools::Error(message.c_str());

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list