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 a0ba36288a4ed0b0e3ebeb339bc8303d778b4225 (commit)
via b3b57e7a31446bf7b0e47c7508d34f34cb322a6a (commit)
from f9402d8b1596493374372ebf04a6c07620ae277f (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=a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
commit a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
Merge: f9402d8 b3b57e7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 13 08:39:29 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 13 08:39:29 2013 -0400
Merge topic 'doc-enable_language-scope' into next
b3b57e7 enable_language: Clarify documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
commit b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 12 10:25:43 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 12 10:58:32 2013 -0400
enable_language: Clarify documentation
Describe explicitly the scope in which enable_language must be
invoked to handle all direct and indirect uses of a language.
While at it, re-word documentation of the OPTIONAL keyword to
avoid confusion over its partial implementation.
diff --git a/Source/cmEnableLanguageCommand.h b/Source/cmEnableLanguageCommand.h
index ee963f9..747448b 100644
--- a/Source/cmEnableLanguageCommand.h
+++ b/Source/cmEnableLanguageCommand.h
@@ -59,18 +59,21 @@ public:
virtual const char* GetFullDocumentation() const
{
return
- " enable_language(languageName [OPTIONAL] )\n"
+ " enable_language(<lang> [OPTIONAL] )\n"
"This command enables support for the named language in CMake. "
"This is the same as the project command but does not create "
"any of the extra variables that are created by the project command. "
"Example languages are CXX, C, Fortran. "
- "If OPTIONAL is used, use the CMAKE_<languageName>_COMPILER_WORKS "
- "variable to check whether the language has been enabled successfully."
"\n"
- "This command must be called on file scope (not inside a function) and "
- "the language enabled can only be used in the calling project or its "
- "subdirectories added by add_subdirectory(). Also note that at present, "
- "the OPTIONAL argument does not work.";
+ "This command must be called in file scope, not in a function call. "
+ "Furthermore, it must be called in the highest directory common to "
+ "all targets using the named language directly for compiling sources "
+ "or indirectly through link dependencies. "
+ "It is simplest to enable all needed languages in the top-level "
+ "directory of a project."
+ "\n"
+ "The OPTIONAL keyword is a placeholder for future implementation "
+ "and does not currently work.";
}
cmTypeMacro(cmEnableLanguageCommand, cmCommand);
-----------------------------------------------------------------------
Summary of changes:
Source/cmEnableLanguageCommand.h | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
