[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2593-ga9c9f51
Brad King
brad.king at kitware.com
Tue Mar 19 16:49:55 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a9c9f519467841948965bd2facd3f67d7ee39d8f (commit)
via fc43477de01e4d95a2c68a401afa2fc7f5f4d255 (commit)
from 73d1650657c6e204f5b22c5494bdc118c0912c91 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9c9f519467841948965bd2facd3f67d7ee39d8f
commit a9c9f519467841948965bd2facd3f67d7ee39d8f
Merge: 73d1650 fc43477
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 19 16:49:53 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 19 16:49:53 2013 -0400
Merge topic 'rename-include-current-dir-in-interface-var' into next
fc43477 Rename variable for including current directory in interfaces
diff --cc Tests/QtAutomoc/Adir/CMakeLists.txt
index ebfdb5d,1712223..a1c36ff
--- a/Tests/QtAutomoc/Adir/CMakeLists.txt
+++ b/Tests/QtAutomoc/Adir/CMakeLists.txt
@@@ -1,8 -1,8 +1,8 @@@
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)
+target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET})
generate_export_header(libA)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc43477de01e4d95a2c68a401afa2fc7f5f4d255
commit fc43477de01e4d95a2c68a401afa2fc7f5f4d255
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 19 16:40:06 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 19 16:44:17 2013 -0400
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 at kde.org>
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
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentVariables.cxx | 4 ++--
Source/cmTarget.cxx | 2 +-
.../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(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list