[Cmake-commits] CMake branch, next, updated. v2.8.3-1380-gc542a03
Brad King
brad.king at kitware.com
Mon Jan 17 09:22:17 EST 2011
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 c542a03994bb1045ccd5b9f2ad982c6a37325208 (commit)
via 4c980e36bb065e2b877fe8c50067a50346ef0f7c (commit)
via 0d7cf4951a5f3e375096ba4426a6cb503266f9df (commit)
from 4fe8e674b752b4397d191296e0bc1947fe72ad5f (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=c542a03994bb1045ccd5b9f2ad982c6a37325208
commit c542a03994bb1045ccd5b9f2ad982c6a37325208
Merge: 4fe8e67 4c980e3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:22:15 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 09:22:15 2011 -0500
Merge topic 'doc-old-get_X_property-commands' into next
4c980e3 Reference get_property() from old get_*_property() commands
0d7cf49 Fix get_(cmake|test)_property documentation (#11703)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c980e36bb065e2b877fe8c50067a50346ef0f7c
commit 4c980e36bb065e2b877fe8c50067a50346ef0f7c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:19:45 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 09:19:45 2011 -0500
Reference get_property() from old get_*_property() commands
The former is a much more general and modern command. Refer authors to
it from documentation of its predecessors.
diff --git a/Source/cmGetCMakePropertyCommand.h b/Source/cmGetCMakePropertyCommand.h
index acbbfee..d82be70 100644
--- a/Source/cmGetCMakePropertyCommand.h
+++ b/Source/cmGetCMakePropertyCommand.h
@@ -59,7 +59,9 @@ public:
"If the property is not found, VAR will be set to \"NOTFOUND\". "
"Some supported properties "
"include: VARIABLES, CACHE_VARIABLES, COMMANDS, MACROS, and "
- "COMPONENTS.";
+ "COMPONENTS."
+ "\n"
+ "See also the more general get_property() command.";
}
cmTypeMacro(cmGetCMakePropertyCommand, cmCommand);
diff --git a/Source/cmGetDirectoryPropertyCommand.h b/Source/cmGetDirectoryPropertyCommand.h
index c3a23a3..b7a5f71 100644
--- a/Source/cmGetDirectoryPropertyCommand.h
+++ b/Source/cmGetDirectoryPropertyCommand.h
@@ -66,7 +66,8 @@ public:
"Get a variable definition from a directory. "
"This form is useful to get a variable definition from another "
"directory."
- ;
+ "\n"
+ "See also the more general get_property() command.";
}
cmTypeMacro(cmGetDirectoryPropertyCommand, cmCommand);
diff --git a/Source/cmGetSourceFilePropertyCommand.h b/Source/cmGetSourceFilePropertyCommand.h
index c1d5e11..56469f8 100644
--- a/Source/cmGetSourceFilePropertyCommand.h
+++ b/Source/cmGetSourceFilePropertyCommand.h
@@ -53,7 +53,9 @@ public:
"stored in the variable VAR. If the property is not found, VAR "
"will be set to \"NOTFOUND\". Use set_source_files_properties to set "
"property values. Source file properties usually control how the "
- "file is built. One property that is always there is LOCATION";
+ "file is built. One property that is always there is LOCATION"
+ "\n"
+ "See also the more general get_property() command.";
}
cmTypeMacro(cmGetSourceFilePropertyCommand, cmCommand);
diff --git a/Source/cmGetTargetPropertyCommand.h b/Source/cmGetTargetPropertyCommand.h
index e1984c3..71c75ef 100644
--- a/Source/cmGetTargetPropertyCommand.h
+++ b/Source/cmGetTargetPropertyCommand.h
@@ -55,7 +55,9 @@ public:
"property values. Properties are usually used to control how "
"a target is built, but some query the target instead. "
"This command can get properties for any target so far created. "
- "The targets do not need to be in the current CMakeLists.txt file.";
+ "The targets do not need to be in the current CMakeLists.txt file."
+ "\n"
+ "See also the more general get_property() command.";
}
cmTypeMacro(cmGetTargetPropertyCommand, cmCommand);
diff --git a/Source/cmGetTestPropertyCommand.h b/Source/cmGetTestPropertyCommand.h
index 2b58ab9..d9f5d9b 100644
--- a/Source/cmGetTestPropertyCommand.h
+++ b/Source/cmGetTestPropertyCommand.h
@@ -52,7 +52,9 @@ public:
"Get a property from the Test. The value of the property is "
"stored in the variable VAR. If the property is not found, VAR "
"will be set to \"NOTFOUND\". For a list of standard properties "
- "you can type cmake --help-property-list";
+ "you can type cmake --help-property-list"
+ "\n"
+ "See also the more general get_property() command.";
}
cmTypeMacro(cmGetTestPropertyCommand, cmCommand);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7cf4951a5f3e375096ba4426a6cb503266f9df
commit 0d7cf4951a5f3e375096ba4426a6cb503266f9df
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:14:35 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 09:14:35 2011 -0500
Fix get_(cmake|test)_property documentation (#11703)
The signature of get_test_property uses argument order
test property VAR
not
test VAR property
Also document the actual behavior when the property is not found.
diff --git a/Source/cmGetCMakePropertyCommand.h b/Source/cmGetCMakePropertyCommand.h
index c78671e..acbbfee 100644
--- a/Source/cmGetCMakePropertyCommand.h
+++ b/Source/cmGetCMakePropertyCommand.h
@@ -54,9 +54,10 @@ public:
{
return
" get_cmake_property(VAR property)\n"
- "Get a property from the CMake instance. The value of the "
- "property is stored in the variable VAR. If the property is "
- "not found, CMake will report an error. Some supported properties "
+ "Get a property from the CMake instance. "
+ "The value of the property is stored in the variable VAR. "
+ "If the property is not found, VAR will be set to \"NOTFOUND\". "
+ "Some supported properties "
"include: VARIABLES, CACHE_VARIABLES, COMMANDS, MACROS, and "
"COMPONENTS.";
}
diff --git a/Source/cmGetTestPropertyCommand.h b/Source/cmGetTestPropertyCommand.h
index 956cf55..2b58ab9 100644
--- a/Source/cmGetTestPropertyCommand.h
+++ b/Source/cmGetTestPropertyCommand.h
@@ -48,10 +48,10 @@ public:
virtual const char* GetFullDocumentation()
{
return
- " get_test_property(test VAR property)\n"
- "Get a property from the Test. The value of the property is "
- "stored in the variable VAR. If the property is not found, "
- "CMake will report an error. For a list of standard properties "
+ " get_test_property(test property VAR)\n"
+ "Get a property from the Test. The value of the property is "
+ "stored in the variable VAR. If the property is not found, VAR "
+ "will be set to \"NOTFOUND\". For a list of standard properties "
"you can type cmake --help-property-list";
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGetCMakePropertyCommand.h | 11 +++++++----
Source/cmGetDirectoryPropertyCommand.h | 3 ++-
Source/cmGetSourceFilePropertyCommand.h | 4 +++-
Source/cmGetTargetPropertyCommand.h | 4 +++-
Source/cmGetTestPropertyCommand.h | 12 +++++++-----
5 files changed, 22 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list