summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-01-15 19:34:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-01-15 19:34:33 (GMT)
commita269e65de47f2f91b5d2cef8660c6f81f5e743dd (patch)
treeccf99b321770db89f29a6ea94cd8224be3ec14be
parent8d91e23565e01765d821716fcd3d64d7e45e6440 (diff)
parent7c7b94f21ffa6f3bda054d5e11bd09b13155c04e (diff)
downloadCMake-a269e65de47f2f91b5d2cef8660c6f81f5e743dd.zip
CMake-a269e65de47f2f91b5d2cef8660c6f81f5e743dd.tar.gz
CMake-a269e65de47f2f91b5d2cef8660c6f81f5e743dd.tar.bz2
Merge topic 'commands-genex-docs'
7c7b94f Document the use of generator expressions in new commands.
-rw-r--r--Source/cmTargetCompileDefinitionsCommand.h3
-rw-r--r--Source/cmTargetIncludeDirectoriesCommand.h3
-rw-r--r--Source/cmTargetPropCommandBase.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h
index 707610e..4b066b7a 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -69,6 +69,9 @@ public:
"INTERFACE_COMPILE_DEFINITIONS from. "
"Repeated calls for the same <target> append items in the order called."
"\n"
+ "Arguments to target_compile_definitions may use \"generator "
+ "expressions\" with the syntax \"$<...>\". "
+ CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS
;
}
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index c1957d6..90e039c 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -73,6 +73,9 @@ public:
"directories must be absolute paths, not relative paths. "
"Repeated calls for the same <target> append items in the order called."
"\n"
+ "Arguments to target_include_directories may use \"generator "
+ "expressions\" with the syntax \"$<...>\". "
+ CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS
;
}
diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h
index 90e3bbb..e757f9d 100644
--- a/Source/cmTargetPropCommandBase.h
+++ b/Source/cmTargetPropCommandBase.h
@@ -14,6 +14,7 @@
#define cmTargetPropCommandBase_h
#include "cmCommand.h"
+#include "cmDocumentGeneratorExpressions.h"
class cmTarget;