[Cmake-commits] CMake branch, next, updated. v2.8.8-3384-g408ec16
Brad King
brad.king at kitware.com
Mon Jul 9 08:47:18 EDT 2012
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 408ec161faa11e040cf317d6dcf1480ccf05dfe7 (commit)
via 280a333e1e29f4d29fd3e11298f983bd9873c1f2 (commit)
from ac14f780b99e2172b230a93cd34feb38b6be8635 (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=408ec161faa11e040cf317d6dcf1480ccf05dfe7
commit 408ec161faa11e040cf317d6dcf1480ccf05dfe7
Merge: ac14f78 280a333
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 9 08:47:15 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 9 08:47:15 2012 -0400
Merge topic 'inject_code_via_variable' into next
280a333 Fix project command documentation typo (#13384)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=280a333e1e29f4d29fd3e11298f983bd9873c1f2
commit 280a333e1e29f4d29fd3e11298f983bd9873c1f2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 9 08:43:38 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 9 08:44:13 2012 -0400
Fix project command documentation typo (#13384)
Commit 9090572f (Add ability to include a file in a project via a cache
variable, 2012-02-17) taught the project() command to check variable
"CMAKE_PROJECT_<projectName>_INCLUDE" but the documentation included an
extra "_FILE" by accident. Remove it.
diff --git a/Source/cmProjectCommand.h b/Source/cmProjectCommand.h
index 1e5fc09..9a40081 100644
--- a/Source/cmProjectCommand.h
+++ b/Source/cmProjectCommand.h
@@ -69,7 +69,7 @@ public:
"C++ compiler, you can disable the check for it by explicitly listing "
"the languages you want to support, e.g. C. By using the special "
"language \"NONE\" all checks for any language can be disabled. "
- "If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE_FILE, "
+ "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.";
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmProjectCommand.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list