diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-25 14:08:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-25 14:08:05 (GMT) |
| commit | 365ada46ce4eb766ea295fba2974cde96d0a024a (patch) | |
| tree | c774841a2c4c966086cf1934b25eb462bf24d20c /Source | |
| parent | 33c2254aef2f8cc11df611a462b6127bc46260d8 (diff) | |
| parent | fc43477de01e4d95a2c68a401afa2fc7f5f4d255 (diff) | |
| download | CMake-365ada46ce4eb766ea295fba2974cde96d0a024a.zip CMake-365ada46ce4eb766ea295fba2974cde96d0a024a.tar.gz CMake-365ada46ce4eb766ea295fba2974cde96d0a024a.tar.bz2 | |
Merge topic 'rename-include-current-dir-in-interface-var'
fc43477 Rename variable for including current directory in interfaces
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 2f55098..50509a0 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1164,14 +1164,14 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Variables that Control the Build"); cm->DefineProperty - ("CMAKE_BUILD_INTERFACE_INCLUDES", cmProperty::VARIABLE, + ("CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE", cmProperty::VARIABLE, "Automatically add the current source- and build directories " "to the INTERFACE_INCLUDE_DIRECTORIES.", "If this variable is enabled, CMake automatically adds for each shared " "library target, static library target, module target and executable " "target, ${CMAKE_CURRENT_SOURCE_DIR} and ${CMAKE_CURRENT_BINARY_DIR} to " "the INTERFACE_INCLUDE_DIRECTORIES." - "By default CMAKE_BUILD_INTERFACE_INCLUDES is OFF.", + "By default CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE is OFF.", false, "Variables that Control the Build"); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 56eb4ad..61d4ce2 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2745,7 +2745,7 @@ void cmTarget::AppendBuildInterfaceIncludes() } this->BuildInterfaceIncludesAppended = true; - if (this->Makefile->IsOn("CMAKE_BUILD_INTERFACE_INCLUDES")) + if (this->Makefile->IsOn("CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE")) { const char *binDir = this->Makefile->GetStartOutputDirectory(); const char *srcDir = this->Makefile->GetStartDirectory(); |