[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2959-gc464c1c

Brad King brad.king at kitware.com
Mon Jul 8 08:26:18 EDT 2013


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  c464c1c94fe6947d3217c6bfa93b50230f3914be (commit)
       via  4a71168735b2e76abdd4d87578ec9587d7e9ebff (commit)
      from  3bb571c197e4428323fc6de4e4c7e7c323d40a40 (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=c464c1c94fe6947d3217c6bfa93b50230f3914be
commit c464c1c94fe6947d3217c6bfa93b50230f3914be
Merge: 3bb571c 4a71168
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 08:26:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 8 08:26:14 2013 -0400

    Merge topic 'doc-project-top-level' into next
    
    4a71168 project: Document top-level CMakeLists.txt requirement


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a71168735b2e76abdd4d87578ec9587d7e9ebff
commit 4a71168735b2e76abdd4d87578ec9587d7e9ebff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 08:20:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 08:22:30 2013 -0400

    project: Document top-level CMakeLists.txt requirement
    
    CMake requires the top-level CMakeLists.txt to contain a direct call to
    the project() command and will insert one if there is not.  Document
    this requirement since some authors have tried to use include() to load
    a file calling the project command.

diff --git a/Source/cmProjectCommand.h b/Source/cmProjectCommand.h
index a53cb3f..9547c4c 100644
--- a/Source/cmProjectCommand.h
+++ b/Source/cmProjectCommand.h
@@ -71,7 +71,13 @@ public:
       "language \"NONE\" all checks for any language can be disabled. "
       "If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE, "
       "the file pointed to by that variable will be included as the last step "
-      "of the project command.";
+      "of the project command."
+      "\n"
+      "The top-level CMakeLists.txt file for a project must contain a "
+      "literal, direct call to the project() command; loading one through "
+      "the include() command is not sufficient.  "
+      "If no such call exists CMake will implicitly add one to the top that "
+      "enables the default languages (C and CXX).";
     }
 
   cmTypeMacro(cmProjectCommand, cmCommand);

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

Summary of changes:
 Source/cmProjectCommand.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list