[Cmake-commits] CMake branch, next, updated. v3.3.2-3097-g719c5e5
Stephen Kelly
steveire at gmail.com
Fri Sep 18 14:32:07 EDT 2015
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 719c5e535018405e5af72dead1c86fe50a013798 (commit)
via 09b972f5056af71d6d6ff85baa2e4e5b5e266ab1 (commit)
from 5f52553b93ab3e1eda049d91d6317af0df18dc5a (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=719c5e535018405e5af72dead1c86fe50a013798
commit 719c5e535018405e5af72dead1c86fe50a013798
Merge: 5f52553 09b972f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 18 14:32:07 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 18 14:32:07 2015 -0400
Merge topic 'fix-compatibility-mode-LOCATION' into next
09b972f5 Revert "CMP0026: Use compatibility codepath until configure is finished (#15748)"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09b972f5056af71d6d6ff85baa2e4e5b5e266ab1
commit 09b972f5056af71d6d6ff85baa2e4e5b5e266ab1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 18 20:31:38 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 18 20:31:38 2015 +0200
Revert "CMP0026: Use compatibility codepath until configure is finished (#15748)"
This reverts commit d02c5b6e4dda77812f4de5410283aaeba5c0488e.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 555c437..fb5805b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2218,7 +2218,7 @@ cmGeneratorTarget::GetIncludeDirectories(const std::string& config,
"INCLUDE_DIRECTORIES")
!= debugProperties.end();
- if (this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (this->Makefile->IsConfigured())
{
this->DebugIncludesDone = true;
}
@@ -2365,7 +2365,7 @@ void cmGeneratorTarget::GetCompileOptions(std::vector<std::string> &result,
"COMPILE_OPTIONS")
!= debugProperties.end();
- if (this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (this->Makefile->IsConfigured())
{
this->DebugCompileOptionsDone = true;
}
@@ -2435,7 +2435,7 @@ void cmGeneratorTarget::GetCompileFeatures(std::vector<std::string> &result,
"COMPILE_FEATURES")
!= debugProperties.end();
- if (this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (this->Makefile->IsConfigured())
{
this->DebugCompileFeaturesDone = true;
}
@@ -2503,7 +2503,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
"COMPILE_DEFINITIONS")
!= debugProperties.end();
- if (this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (this->Makefile->IsConfigured())
{
this->DebugCompileDefinitionsDone = true;
}
@@ -3937,7 +3937,7 @@ cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
p)
!= debugProperties.end();
- if (this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (this->Target->GetMakefile()->IsConfigured())
{
this->DebugCompatiblePropertiesDone[p] = true;
}
@@ -4504,7 +4504,7 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
std::vector<cmGeneratorTarget*> objectLibraries;
std::vector<cmSourceFile const*> externalObjects;
- if (!this->GlobalGenerator->GetConfigureDoneCMP0026())
+ if (!this->Makefile->IsConfigured())
{
std::vector<cmTarget*> objectTargets;
this->Target->GetObjectLibrariesCMP0026(objectTargets);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 13e0d7e..2dfa19c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -636,7 +636,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
{
assert(this->GetType() != INTERFACE_LIBRARY);
- if (!this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+ if (!this->Makefile->IsConfigured())
{
// At configure-time, this method can be called as part of getting the
// LOCATION property or to export() a file to be include()d. However
@@ -682,7 +682,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
"SOURCES")
!= debugProperties.end();
- if (this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+ if (this->Makefile->IsConfigured())
{
this->DebugSourcesDone = true;
}
diff --git a/Tests/RunCMake/CMP0026/RunCMakeTest.cmake b/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
index 6331717..fc58ea5 100644
--- a/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0026/RunCMakeTest.cmake
@@ -11,4 +11,3 @@ run_cmake(CMP0026-LOCATION-CONFIG-OLD)
run_cmake(CMP0026-LOCATION-CONFIG-WARN)
run_cmake(ObjlibNotDefined)
run_cmake(LOCATION-and-TARGET_OBJECTS)
-run_cmake(clear-cached-information)
diff --git a/Tests/RunCMake/CMP0026/clear-cached-information-dir/CMakeLists.txt b/Tests/RunCMake/CMP0026/clear-cached-information-dir/CMakeLists.txt
deleted file mode 100644
index c51e883..0000000
--- a/Tests/RunCMake/CMP0026/clear-cached-information-dir/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_executable(Hello ${CMAKE_CURRENT_BINARY_DIR}/main.c)
diff --git a/Tests/RunCMake/CMP0026/clear-cached-information.cmake b/Tests/RunCMake/CMP0026/clear-cached-information.cmake
deleted file mode 100644
index dd2dd72..0000000
--- a/Tests/RunCMake/CMP0026/clear-cached-information.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-
-enable_language(C)
-
-cmake_policy(SET CMP0026 OLD)
-
-add_subdirectory(clear-cached-information-dir)
-
-# Critical: this needs to happen in root CMakeLists.txt and not inside
-# the subdir.
-get_target_property(mypath Hello LOCATION)
-# Now we create the file later, so you can see, ultimately no error should
-# happen e.g. during generate phase:
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clear-cached-information-dir/main.c)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/clear-cached-information-dir/main.c PROPERTIES GENERATED TRUE)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 12 ++++++------
Source/cmTarget.cxx | 4 ++--
Tests/RunCMake/CMP0026/RunCMakeTest.cmake | 1 -
.../CMP0026/clear-cached-information-dir/CMakeLists.txt | 2 --
Tests/RunCMake/CMP0026/clear-cached-information.cmake | 14 --------------
5 files changed, 8 insertions(+), 25 deletions(-)
delete mode 100644 Tests/RunCMake/CMP0026/clear-cached-information-dir/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0026/clear-cached-information.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list