summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-06-05 13:39:12 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-06-05 13:39:12 (GMT)
commit2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (patch)
treecdc33f8f60fb0b602c2d7b271a8a40e380fd8ba3
parent93317839b0aa7b47e37aad96ef3e0d4cfea236ba (diff)
parent9efe35906af4447533d9e594df539e71293437dd (diff)
downloadCMake-2cd8a6a3c6d505674e113345c58edfb19bf8dc2e.zip
CMake-2cd8a6a3c6d505674e113345c58edfb19bf8dc2e.tar.gz
CMake-2cd8a6a3c6d505674e113345c58edfb19bf8dc2e.tar.bz2
Merge topic 'cleanups'
9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation. db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method.
-rw-r--r--Source/cmAddDefinitionsCommand.h2
-rw-r--r--Source/cmMakefile.cxx12
2 files changed, 6 insertions, 8 deletions
diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h
index 6705d11..ff2c4a0 100644
--- a/Source/cmAddDefinitionsCommand.h
+++ b/Source/cmAddDefinitionsCommand.h
@@ -73,8 +73,6 @@ public:
}
cmTypeMacro(cmAddDefinitionsCommand, cmCommand);
-private:
- bool ParseDefinition(std::string const& def);
};
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e1c1241..7d58d68 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4032,20 +4032,20 @@ void cmMakefile::DefineProperties(cmake *cm)
("INCLUDE_DIRECTORIES", cmProperty::DIRECTORY,
"List of preprocessor include file search directories.",
"This property specifies the list of directories given "
- "so far to the include_directories command. "
- "This property exists on directories and targets. "
+ "so far to the include_directories command. "
+ "This property exists on directories and targets. "
"In addition to accepting values from the include_directories "
"command, values may be set directly on any directory or any "
- "target using the set_property command. "
+ "target using the set_property command. "
"A target gets its initial value for this property from the value "
- "of the directory property. "
+ "of the directory property. "
"A directory gets its initial value from its parent directory if "
- "it has one. "
+ "it has one. "
"Both directory and target property values are adjusted by calls "
"to the include_directories command."
"\n"
"The target property values are used by the generators to set "
- "the include paths for the compiler. "
+ "the include paths for the compiler. "
"See also the include_directories command.");
cm->DefineProperty