[Cmake-commits] CMake branch, next, updated. v2.8.7-2972-g62bb3fb

[Bill Hoffman]

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  62bb3fb93b8077a3bdee8566f3d63177bbe088c6 (commit)
       via  2557a080543a37f92e1908420842db8c90685304 (commit)
      from  b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61 (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=62bb3fb93b8077a3bdee8566f3d63177bbe088c6
commit 62bb3fb93b8077a3bdee8566f3d63177bbe088c6
Merge: b71538d 2557a08
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Feb 29 22:29:13 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 29 22:29:13 2012 -0500

    Merge topic 'inject_code_via_variable' into next
    
    2557a08 Fix typo in error message, and remove redundent test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2557a080543a37f92e1908420842db8c90685304
commit 2557a080543a37f92e1908420842db8c90685304
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Feb 29 22:28:06 2012 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Feb 29 22:28:06 2012 -0500

    Fix typo in error message, and remove redundent test.

diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 4c1abcf..fcf0a49 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -88,7 +88,7 @@ bool cmProjectCommand
     if(!readit && !cmSystemTools::GetFatalErrorOccured())
       {
       std::string m =
-        "could not find load file:\n"
+        "could not find file:\n"
         "  ";
       m += include;
       this->SetError(m.c_str());
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 629f578..a1551ca 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -23,8 +23,6 @@ add_CMakeOnly_test(AllFindModules)
 
 add_CMakeOnly_test(TargetScope)
 
-add_CMakeOnly_test(ProjectInclude)
-
 add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND}
   -DTEST=ProjectInclude
   -DCMAKE_ARGS=-DCMAKE_PROJECT_ProjectInclude_INCLUDE=${CMAKE_CURRENT_SOURCE_DIR}/ProjectInclude/include.cmake

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

Summary of changes:
 Source/cmProjectCommand.cxx    |    2 +-
 Tests/CMakeOnly/CMakeLists.txt |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake