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 <neundorf@kde.org>

8 files changed, 9 insertions, 9 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();
diff --git a/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/subdir/CMakeLists.txt
index 61a1a59..9d7fa6c 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 337168f..cdf67c2 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 2d11040..a5c6413 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 abd328e..1712223 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 5497105..d9d4aa7 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 ebfbb03..fd624c8 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