[Cmake-commits] CMake branch, next, updated. v2.8.3-1323-ga3a4906

[Brad King]

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  a3a490644c5d950680f5c5142131c41c075288a9 (commit)
       via  4da2a5687be6ec91f8001ba0366776f775531431 (commit)
      from  c2158199a4744615b199c6bed39cba77a96680c2 (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=a3a490644c5d950680f5c5142131c41c075288a9
commit a3a490644c5d950680f5c5142131c41c075288a9
Merge: c215819 4da2a56
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 12 08:15:44 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 12 08:15:44 2011 -0500

    Merge topic 'doc-try_compile-clarification' into next
    
    4da2a56 Document try_compile behavior more clearly (#11688)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da2a5687be6ec91f8001ba0366776f775531431
commit 4da2a5687be6ec91f8001ba0366776f775531431
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 12 08:13:15 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 12 08:13:15 2011 -0500

    Document try_compile behavior more clearly (#11688)
    
    Explicitly state up front that the source-file form of the command links
    an executable and expects a 'main' to be defined.  While at it, update
    the command signature documentation to use a syntax more consistent with
    other commands.  Also tweak some wording.

diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h
index 3a30e4c..5b4ffca 100644
--- a/Source/cmTryCompileCommand.h
+++ b/Source/cmTryCompileCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual const char* GetTerseDocumentation() 
     {
-    return "Try compiling some code.";
+    return "Try building some code.";
     }
 
   /**
@@ -55,23 +55,28 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  try_compile(RESULT_VAR bindir srcdir\n"
-      "              projectName <targetname> [CMAKE_FLAGS <Flags>]\n"
-      "              [OUTPUT_VARIABLE var])\n"
-      "Try compiling a program.  In this form, srcdir should contain a "
-      "complete CMake project with a CMakeLists.txt file and all sources. The "
-      "bindir and srcdir will not be deleted after this command is run. "
-      "If <target name> is specified then build just that target "
-      "otherwise the all or ALL_BUILD target is built.\n"
-      "  try_compile(RESULT_VAR bindir srcfile\n"
-      "              [CMAKE_FLAGS <Flags>]\n"
-      "              [COMPILE_DEFINITIONS <flags> ...]\n"
-      "              [OUTPUT_VARIABLE var]\n"
-      "              [COPY_FILE <filename> )\n"
-      "Try compiling a srcfile.  In this case, the user need only supply a "
-      "source file.  CMake will create the appropriate CMakeLists.txt file "
-      "to build the source. If COPY_FILE is used, the compiled file will be "
-      "copied to the given file.\n"
+      "  try_compile(RESULT_VAR <bindir> <srcdir>\n"
+      "              <projectName> [targetName] [CMAKE_FLAGS flags...]\n"
+      "              [OUTPUT_VARIABLE <var>])\n"
+      "Try building a project.  In this form, srcdir should contain a "
+      "complete CMake project with a CMakeLists.txt file and all sources. "
+      "The bindir and srcdir will not be deleted after this command is run. "
+      "Specify targetName to build a specific target instead of the 'all' or "
+      "'ALL_BUILD' target."
+      "\n"
+      "  try_compile(RESULT_VAR <bindir> <srcfile>\n"
+      "              [CMAKE_FLAGS flags...]\n"
+      "              [COMPILE_DEFINITIONS flags...]\n"
+      "              [OUTPUT_VARIABLE <var>]\n"
+      "              [COPY_FILE <fileName>])\n"
+      "Try building a source file into an executable.  "
+      "In this form the user need only supply a source file that defines "
+      "a 'main'.  "
+      "CMake will create a CMakeLists.txt file to build the source "
+      "as an executable.  "
+      "Specify COPY_FILE to get a copy of the linked executable at the "
+      "given fileName."
+      "\n"
       "In this version all files in bindir/CMakeFiles/CMakeTmp, "
       "will be cleaned automatically, for debugging a --debug-trycompile can "
       "be passed to cmake to avoid the clean. Some extra flags that "

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

Summary of changes:
 Source/cmTryCompileCommand.h |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake