summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-03-25 19:23:01 +0100
committerStephen Kelly <steveire@gmail.com>2013-03-25 19:23:01 +0100
commit2e80f9f21f258aeca1537c0a1bafba5c4bdb623c (patch)
tree7def4d42870c83108c470b55d2456726e3a97d5b
parentddbe2e1d7da460684e4d81fc8b3f69510f87b78e (diff)
downloadcmake-2e80f9f21f258aeca1537c0a1bafba5c4bdb623c.tar.gz
Fix new target commands documentation.
The target_include_directories and target_compile_defintions commands accepted targets as arguments until commit f6b16d4b (Don't allow targets args in the new target commands., 2013-01-29). This followed from discussion on the mailing list (target_include_directories() accepts only absolute paths ?, 2013-01-28): http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/5925/focus=5948 http://public.kitware.com/pipermail/cmake-developers/2013-January/006301.html It was also decided to allow relative paths in target_include_directories().
-rw-r--r--Source/cmTargetCompileDefinitionsCommand.h6
-rw-r--r--Source/cmTargetIncludeDirectoriesCommand.h5
2 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h
index c93cacb3f5..ec9b071dbb 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -56,8 +56,7 @@ public:
" target_compile_definitions(<target> "
"<INTERFACE|PUBLIC|PRIVATE> [items1...]\n"
" [<INTERFACE|PUBLIC|PRIVATE> [items2...] ...])\n"
- "Specify compile definitions or targets to use when compiling a given "
- "target. "
+ "Specify compile definitions to use when compiling a given target. "
"The named <target> must have been created by a command such as "
"add_executable or add_library and must not be an IMPORTED target. "
"The INTERFACE, PUBLIC and PRIVATE keywords are required to specify "
@@ -65,8 +64,7 @@ public:
"populate the COMPILE_DEFINITIONS property of <target>. PUBLIC and "
"INTERFACE items will populate the INTERFACE_COMPILE_DEFINITIONS "
"property of <target>. "
- "The non-scope arguments specify compile definitions or targets to use "
- "INTERFACE_COMPILE_DEFINITIONS from. "
+ "The following arguments specify compile definitions. "
"Repeated calls for the same <target> append items in the order called."
"\n"
"Arguments to target_compile_definitions may use \"generator "
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index 2bc7bef058..e4bc9cf67f 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -68,9 +68,8 @@ public:
"populate the INCLUDE_DIRECTORIES property of <target>. PUBLIC and "
"INTERFACE items will populate the INTERFACE_INCLUDE_DIRECTORIES "
"property of <target>. "
- "The non-scope arguments specify either include directories or targets "
- "to use INTERFACE_INCLUDE_DIRECTORIES from. Any specified include "
- "directories must be absolute paths, not relative paths. "
+ "The following arguments specify include directories. Specified "
+ "include directories may be absolute paths or relative paths. "
"Repeated calls for the same <target> append items in the order called."
"\n"
"Arguments to target_include_directories may use \"generator "