From fc43477de01e4d95a2c68a401afa2fc7f5f4d255 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 Mar 2013 16:40:06 -0400 Subject: [PATCH] Rename variable for including current directory in interfaces Rename the variable added by commit 9ce1b9ef (Add CMAKE_BUILD_INTERFACE_INCLUDES build-variable, 2012-11-25) to CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE to be more consistent with the existing CMAKE_INCLUDE_CURRENT_DIR variable. Suggested-by: Alex Neundorf --- Source/cmDocumentVariables.cxx | 4 ++-- Source/cmTarget.cxx | 2 +- .../CMakeCommands/target_link_libraries/subdir/CMakeLists.txt | 2 +- Tests/ExportImport/Export/CMakeLists.txt | 2 +- Tests/ExportImport/Export/sublib/CMakeLists.txt | 2 +- Tests/QtAutomoc/Adir/CMakeLists.txt | 2 +- Tests/QtAutomoc/Bdir/CMakeLists.txt | 2 +- Tests/QtAutomoc/CMakeLists.txt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 2f550984b..50509a0b3 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 56eb4ad49..61d4ce201 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(); diff --git a/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt index 61a1a5988..9d7fa6cb8 100644 --- a/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt +++ b/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_BUILD_INTERFACE_INCLUDES ON) +set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) add_library(subdirlib SHARED subdirlib.cpp) generate_export_header(subdirlib) diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index 337168fbe..cdf67c2a7 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -291,7 +291,7 @@ if(WIN32) install(TARGETS testLib5 RUNTIME DESTINATION bin) endif() -add_subdirectory(sublib) # For CMAKE_BUILD_INTERFACE_INCLUDES test. +add_subdirectory(sublib) # For CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE test. # Export from build tree. export(TARGETS testExe1 testLib1 testLib2 testLib3 diff --git a/Tests/ExportImport/Export/sublib/CMakeLists.txt b/Tests/ExportImport/Export/sublib/CMakeLists.txt index 2d11040a9..a5c6413c1 100644 --- a/Tests/ExportImport/Export/sublib/CMakeLists.txt +++ b/Tests/ExportImport/Export/sublib/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_BUILD_INTERFACE_INCLUDES ON) +set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) add_library(subdirlib SHARED subdir.cpp) diff --git a/Tests/QtAutomoc/Adir/CMakeLists.txt b/Tests/QtAutomoc/Adir/CMakeLists.txt index abd328e76..171222319 100644 --- a/Tests/QtAutomoc/Adir/CMakeLists.txt +++ b/Tests/QtAutomoc/Adir/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_BUILD_INTERFACE_INCLUDES ON) +set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) add_library(libA SHARED libA.cpp) target_link_libraries(libA LINK_PUBLIC Qt4::QtCore) diff --git a/Tests/QtAutomoc/Bdir/CMakeLists.txt b/Tests/QtAutomoc/Bdir/CMakeLists.txt index 549710571..d9d4aa7fa 100644 --- a/Tests/QtAutomoc/Bdir/CMakeLists.txt +++ b/Tests/QtAutomoc/Bdir/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_BUILD_INTERFACE_INCLUDES ON) +set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) add_library(libB SHARED libB.cpp) generate_export_header(libB) diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt index ebfbb0363..fd624c803 100644 --- a/Tests/QtAutomoc/CMakeLists.txt +++ b/Tests/QtAutomoc/CMakeLists.txt @@ -25,7 +25,7 @@ set_target_properties(foo codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE) include(GenerateExportHeader) # The order is relevant here. B depends on A, and B headers depend on A -# headers both subdirectories use CMAKE_BUILD_INTERFACE_INCLUDES and we +# headers both subdirectories use CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE and we # test that CMAKE_AUTOMOC successfully reads the include directories # for the build interface from those targets. There has previously been # a bug where caching of the include directories happened before