[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-226-g0cbe2ed
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, master has been updated via 0cbe2edb23d581233c518beafe92a2c9d4f529ac (commit) from 5ebba228823ffc96e82f4b6cc1103c2f2ed8cfa7 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cbe2edb23d581233c518beafe92a2c9d4f529ac commit 0cbe2edb23d581233c518beafe92a2c9d4f529ac Author: Kitware Robot AuthorDate: Mon Oct 17 00:01:03 2016 -0400 Commit: Kitware Robot CommitDate: Mon Oct 17 00:01:03 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 953fc4c..3640ea8 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161016) +set(CMake_VERSION_PATCH 20161017) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-549-ga23f4f0
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 a23f4f0666fdbfb7ab75635f62e216b5d5d158d0 (commit)
via 9ce8fbf522e84f3f596e90453b4c652514a00099 (commit)
from 54379cab91d6b2d6940d65fa8dd31530bd30ae52 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
commit a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
Merge: 54379ca 9ce8fbf
Author: Gregor Jasny
AuthorDate: Sun Oct 16 15:32:13 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 15:32:13 2016 -0400
Merge topic 'refactor-folder-name-retrieval' into next
9ce8fbf5 Refactor IDE folder name retrieval into GetEffectiveFolderName()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce8fbf522e84f3f596e90453b4c652514a00099
commit 9ce8fbf522e84f3f596e90453b4c652514a00099
Author: Gregor Jasny
AuthorDate: Tue Aug 30 20:55:37 2016 +0200
Commit: Gregor Jasny
CommitDate: Sun Oct 16 21:27:47 2016 +0200
Refactor IDE folder name retrieval into GetEffectiveFolderName()
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7eb0ebf..eb9f419 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1767,6 +1767,22 @@ std::string cmGeneratorTarget::GetMacContentDirectory(
return fpath;
}
+std::string cmGeneratorTarget::GetEffectiveFolderName() const
+{
+std::string effectiveFolder;
+
+if (!this->GlobalGenerator->UseFolderProperty()) {
+return effectiveFolder;
+}
+
+const char* targetFolder = this->GetProperty("FOLDER");
+if (targetFolder) {
+effectiveFolder += targetFolder;
+}
+
+return effectiveFolder;
+}
+
cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
const std::string& config) const
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 68ffd5c..9382726 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -220,6 +220,9 @@ public:
std::string GetMacContentDirectory(const std::string& config = CM_NULLPTR,
bool implib = false) const;
+ /** @return folder prefix for IDEs. */
+ std::string GetEffectiveFolderName() const;
+
cmTarget* Target;
cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index 5fbaea4..3154f8d 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -44,9 +44,7 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
std::string cmGhsMultiTargetGenerator::GetRelBuildFilePath(
const cmGeneratorTarget* target)
{
- std::string output;
- char const* folderProp = target->GetProperty("FOLDER");
- output = NULL == folderProp ? "" : folderProp;
+ std::string output = target->GetEffectiveFolderName();
cmSystemTools::ConvertToUnixSlashes(output);
if (!output.empty()) {
output += "/";
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1aa6af1..7d0c2da 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2377,7 +2377,7 @@ const char*
cmGlobalGenerator::GetPredefinedTargetsFolder()
return "CMakePredefinedTargets";
}
-bool cmGlobalGenerator::UseFolderProperty()
+bool cmGlobalGenerator::UseFolderProperty() const
{
const char* prop =
this->GetCMakeInstance()->GetState()->GetGlobalProperty("USE_FOLDERS");
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 38eaa76..c3498e0 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -334,6 +334,8 @@ public:
i.e. "Can I build Debug and Release in the same tree?" */
virtual bool IsMultiConfig() const { return false; }
+ virtual bool UseFolderProperty() const;
+
std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;
/** Generate an .rule file path for a given command output. */
@@ -463,7 +465,6 @@ protected:
std::string const& name) const;
const char* GetPredefinedTargetsFolder();
- virtual bool UseFolderProperty();
private:
#if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx
b/Source/cmGlobalGhsMultiGenerator.cxx
index 0eac338..d4ae677 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -439,11 +439,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
tgtsI != tgts.end(); ++tgtsI) {
const cmGeneratorTarget* tgt = *tgtsI;
if (IsTgtForBuild(tgt)) {
- char const* rawFolderName = tgt->GetProperty("
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-547-g54379ca
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 54379cab91d6b2d6940d65fa8dd31530bd30ae52 (commit)
via 25dbc485565649f54d64b57f6a35b651b8a15165 (commit)
via 5ebba228823ffc96e82f4b6cc1103c2f2ed8cfa7 (commit)
via ac5b80e76c102d43749555c9bc888f9ac9b7436e (commit)
from 1ebf57341d671befa62b4065b7565a01f1fe06aa (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54379cab91d6b2d6940d65fa8dd31530bd30ae52
commit 54379cab91d6b2d6940d65fa8dd31530bd30ae52
Merge: 1ebf573 25dbc48
Author: Gregor Jasny
AuthorDate: Sun Oct 16 15:24:51 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 15:24:51 2016 -0400
Merge topic '16355-osx-deployment-target-on-cross-compile' into next
25dbc485 Darwin: Do not try to set deployment target when crosscompiling
(#16355)
5ebba228 CMake Nightly Date Stamp
ac5b80e7 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25dbc485565649f54d64b57f6a35b651b8a15165
commit 25dbc485565649f54d64b57f6a35b651b8a15165
Author: Gregor Jasny
AuthorDate: Sun Oct 16 20:56:36 2016 +0200
Commit: Gregor Jasny
CommitDate: Sun Oct 16 20:59:27 2016 +0200
Darwin: Do not try to set deployment target when crosscompiling (#16355)
diff --git a/Modules/Platform/Darwin-Initialize.cmake
b/Modules/Platform/Darwin-Initialize.cmake
index 427909d..39374e1 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -90,7 +90,7 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
endif()
endforeach()
-if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS
_CMAKE_OSX_DEPLOYMENT_TARGET)
+if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_DEPLOYMENT_TARGET AND
_CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
"Minimum OS X version to target for deployment (at runtime); newer
APIs weak linked. Set to empty string for default value." FORCE)
endif()
---
Summary of changes:
Modules/Platform/Darwin-Initialize.cmake |2 +-
Source/CMakeVersion.cmake|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-543-g1ebf573
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 1ebf57341d671befa62b4065b7565a01f1fe06aa (commit)
via cef59bb8bac6b6d38025cc492235953c5ff7654b (commit)
via 0d57b07ad99cefc5df9e65d6c14aeaddf5d64b88 (commit)
via c3fb0d95ad114c9f9680e885c4c2263b43c437dc (commit)
from 0e69f517951fefc4f4917d3101259c8a7a7fbc66 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ebf57341d671befa62b4065b7565a01f1fe06aa
commit 1ebf57341d671befa62b4065b7565a01f1fe06aa
Merge: 0e69f51 cef59bb
Author: Stephen Kelly
AuthorDate: Sun Oct 16 07:58:33 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 07:58:33 2016 -0400
Merge topic 'extract-computed-target-properties' into next
cef59bb8 cmTarget: Implement GetProperty in terms of cmState::Snapshot
0d57b07a cmTarget: Group code for checking written properties together
c3fb0d95 cmTarget: Move sanity checks and computed property access to
callers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cef59bb8bac6b6d38025cc492235953c5ff7654b
commit cef59bb8bac6b6d38025cc492235953c5ff7654b
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 13:57:53 2016 +0200
cmTarget: Implement GetProperty in terms of cmState::Snapshot
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f109444..3a22309 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1222,10 +1222,16 @@ const char* cmTarget::GetProperty(const std::string&
prop) const
return this->GetName().c_str();
}
if (prop == propBINARY_DIR) {
- return this->GetMakefile()->GetCurrentBinaryDirectory();
+ return this->GetMakefile()
+->GetStateSnapshot()
+.GetDirectory()
+.GetCurrentBinary();
}
if (prop == propSOURCE_DIR) {
- return this->GetMakefile()->GetCurrentSourceDirectory();
+ return this->GetMakefile()
+->GetStateSnapshot()
+.GetDirectory()
+.GetCurrentSource();
}
}
@@ -1234,7 +1240,8 @@ const char* cmTarget::GetProperty(const std::string&
prop) const
const bool chain = this->GetMakefile()->GetState()->IsPropertyChained(
prop, cmProperty::TARGET);
if (chain) {
- return this->Makefile->GetProperty(prop, chain);
+ return this->Makefile->GetStateSnapshot().GetDirectory().GetProperty(
+prop, chain);
}
}
return retVal;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d57b07ad99cefc5df9e65d6c14aeaddf5d64b88
commit 0d57b07ad99cefc5df9e65d6c14aeaddf5d64b88
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 13:57:53 2016 +0200
cmTarget: Group code for checking written properties together
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e80768d..f109444 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -852,7 +852,20 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
e << "NAME property is read-only\n";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
+ } else if (prop == "EXPORT_NAME" && this->IsImported()) {
+std::ostringstream e;
+e << "EXPORT_NAME property can't be set on imported targets (\""
+ << this->Name << "\")\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+ } else if (prop == "SOURCES" && this->IsImported()) {
+std::ostringstream e;
+e << "SOURCES property can't be set on imported targets (\"" << this->Name
+ << "\")\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
}
+
if (prop == "INCLUDE_DIRECTORIES") {
this->Internal->IncludeDirectoriesEntries.clear();
this->Internal->IncludeDirectoriesBacktraces.clear();
@@ -885,11 +898,6 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
}
- } else if (prop == "EXPORT_NAME" && this->IsImported()) {
-std::ostringstream e;
-e << "EXPORT_NAME property can't be set on imported targets (\""
- << this->Name << "\")\n";
-this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
} else if (prop == "LINK_LIBRARIES") {
this->Internal->LinkImplementationPropertyEntries.clear();
this->Internal->LinkImplementationPropertyBacktraces.clear();
@@ -899,14 +907,6 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
this->Internal
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-539-g0e69f51
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 0e69f517951fefc4f4917d3101259c8a7a7fbc66 (commit)
via 75ace0a67d0b57eecaf1862e8a5dc68efa0a724b (commit)
from d1f0e3064827cbaa929e8d55ae69ec40fda43a45 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e69f517951fefc4f4917d3101259c8a7a7fbc66
commit 0e69f517951fefc4f4917d3101259c8a7a7fbc66
Merge: d1f0e30 75ace0a
Author: Stephen Kelly
AuthorDate: Sun Oct 16 07:54:59 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 07:54:59 2016 -0400
Merge topic 'extract-computed-target-properties' into next
75ace0a6 fixup! cmTarget: Move sanity checks and computed property access
to callers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75ace0a67d0b57eecaf1862e8a5dc68efa0a724b
commit 75ace0a67d0b57eecaf1862e8a5dc68efa0a724b
Author: Stephen Kelly
AuthorDate: Sun Oct 16 13:54:29 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 13:54:29 2016 +0200
fixup! cmTarget: Move sanity checks and computed property access to callers
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 0a59933..39445dd 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -10,16 +10,6 @@
#include "cmTest.h"
#include "cmake.h"
-#ifdef __clang__
-extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild(
- cmTarget const* tgt);
-extern template const char* cmTargetPropertyComputer::ComputeLocation(
- cmTarget const* tgt, std::string const& config);
-extern template const char* cmTargetPropertyComputer::GetSources(
- cmTarget const* tgt, cmMessenger* messenger,
- cmListFileBacktrace const& context);
-#endif
-
cmGetPropertyCommand::cmGetPropertyCommand()
{
this->InfoType = OutValue;
@@ -262,8 +252,8 @@ bool cmGetPropertyCommand::HandleTargetMode()
cmMessenger* messenger = this->Makefile->GetMessenger();
if (cmTargetPropertyComputer::PassesWhitelist(
target->GetType(), this->PropertyName, messenger, bt)) {
- prop_cstr = cmTargetPropertyComputer::GetProperty(
-target, this->PropertyName, messenger, bt);
+ prop_cstr =
+target->GetComputedProperty(this->PropertyName, messenger, bt);
if (!prop_cstr) {
prop_cstr = target->GetProperty(this->PropertyName);
}
diff --git a/Source/cmGetTargetPropertyCommand.cxx
b/Source/cmGetTargetPropertyCommand.cxx
index d009bc3..6a816d8 100644
--- a/Source/cmGetTargetPropertyCommand.cxx
+++ b/Source/cmGetTargetPropertyCommand.cxx
@@ -4,16 +4,6 @@
#include "cmTargetPropertyComputer.h"
-#ifdef __clang__
-extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild(
- cmTarget const* tgt);
-extern template const char* cmTargetPropertyComputer::ComputeLocation(
- cmTarget const* tgt, std::string const& config);
-extern template const char* cmTargetPropertyComputer::GetSources(
- cmTarget const* tgt, cmMessenger* messenger,
- cmListFileBacktrace const& context);
-#endif
-
// cmSetTargetPropertyCommand
bool cmGetTargetPropertyCommand::InitialPass(
std::vector const& args, cmExecutionStatus&)
@@ -39,8 +29,7 @@ bool cmGetTargetPropertyCommand::InitialPass(
cmMessenger* messenger = this->Makefile->GetMessenger();
if (cmTargetPropertyComputer::PassesWhitelist(tgt->GetType(), args[2],
messenger, bt)) {
-prop_cstr =
- cmTargetPropertyComputer::GetProperty(tgt, args[2], messenger, bt);
+prop_cstr = tgt->GetComputedProperty(args[2], messenger, bt);
if (!prop_cstr) {
prop_cstr = tgt->GetProperty(args[2]);
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b2b7cd6..3a22309 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1129,6 +1129,13 @@ void cmTarget::CheckProperty(const std::string& prop,
}
}
+const char* cmTarget::GetComputedProperty(
+ const std::string& prop, cmMessenger* messenger,
+ cmListFileBacktrace const& context) const
+{
+ return cmTargetPropertyComputer::GetProperty(this, prop, messenger, context);
+}
+
const char* cmTarget::GetProperty(const std::string& prop) const
{
static UNORDERED_SET specialProps;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index d48e7e2..bd00b3d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -202,6 +202,9 @@ public:
const char* GetProperty(const std::string& prop) const;
bool GetPropertyAsBool(const std::string& prop) const;
void CheckProperty(const std::string& prop, cmMakefile* context) const;
+ const cha
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-537-gd1f0e30
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 d1f0e3064827cbaa929e8d55ae69ec40fda43a45 (commit)
via d94460ce3ff089c7746d24378f899008a2e5385d (commit)
via 4b9292a9458d25a9394190de5ac9d9d056768070 (commit)
via a89dc5374b8798e6dbe699b7a074ec7cd9be36e8 (commit)
from 0fde927b36aa8972da15fefa3e0f01ee22c6bcef (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1f0e3064827cbaa929e8d55ae69ec40fda43a45
commit d1f0e3064827cbaa929e8d55ae69ec40fda43a45
Merge: 0fde927b d94460c
Author: Stephen Kelly
AuthorDate: Sun Oct 16 06:09:54 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 06:09:54 2016 -0400
Merge topic 'extract-computed-target-properties' into next
d94460ce cmTarget: Implement GetProperty in terms of cmState::Snapshot
4b9292a9 cmTarget: Group code for checking written properties together
a89dc537 cmTarget: Move sanity checks and computed property access to
callers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d94460ce3ff089c7746d24378f899008a2e5385d
commit d94460ce3ff089c7746d24378f899008a2e5385d
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 12:09:43 2016 +0200
cmTarget: Implement GetProperty in terms of cmState::Snapshot
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d8bc64a..b2b7cd6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1215,10 +1215,16 @@ const char* cmTarget::GetProperty(const std::string&
prop) const
return this->GetName().c_str();
}
if (prop == propBINARY_DIR) {
- return this->GetMakefile()->GetCurrentBinaryDirectory();
+ return this->GetMakefile()
+->GetStateSnapshot()
+.GetDirectory()
+.GetCurrentBinary();
}
if (prop == propSOURCE_DIR) {
- return this->GetMakefile()->GetCurrentSourceDirectory();
+ return this->GetMakefile()
+->GetStateSnapshot()
+.GetDirectory()
+.GetCurrentSource();
}
}
@@ -1227,7 +1233,8 @@ const char* cmTarget::GetProperty(const std::string&
prop) const
const bool chain = this->GetMakefile()->GetState()->IsPropertyChained(
prop, cmProperty::TARGET);
if (chain) {
- return this->Makefile->GetProperty(prop, chain);
+ return this->Makefile->GetStateSnapshot().GetDirectory().GetProperty(
+prop, chain);
}
}
return retVal;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b9292a9458d25a9394190de5ac9d9d056768070
commit 4b9292a9458d25a9394190de5ac9d9d056768070
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 12:09:42 2016 +0200
cmTarget: Group code for checking written properties together
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ef13b26..d8bc64a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -852,7 +852,20 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
e << "NAME property is read-only\n";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
+ } else if (prop == "EXPORT_NAME" && this->IsImported()) {
+std::ostringstream e;
+e << "EXPORT_NAME property can't be set on imported targets (\""
+ << this->Name << "\")\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+ } else if (prop == "SOURCES" && this->IsImported()) {
+std::ostringstream e;
+e << "SOURCES property can't be set on imported targets (\"" << this->Name
+ << "\")\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
}
+
if (prop == "INCLUDE_DIRECTORIES") {
this->Internal->IncludeDirectoriesEntries.clear();
this->Internal->IncludeDirectoriesBacktraces.clear();
@@ -885,11 +898,6 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
this->Internal->CompileDefinitionsBacktraces.push_back(lfbt);
}
- } else if (prop == "EXPORT_NAME" && this->IsImported()) {
-std::ostringstream e;
-e << "EXPORT_NAME property can't be set on imported targets (\""
- << this->Name << "\")\n";
-this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
} else if (prop == "LINK_LIBRARIES") {
this->Internal->LinkImplementationPropertyEntries.clear();
this->Internal->LinkImplementationPropertyBacktraces.clear();
@@ -899,14 +907,6 @@ void cmTarget::SetProperty(const std::string& prop, const
char* value)
this->Interna
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-533-g0fde927b
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 0fde927b36aa8972da15fefa3e0f01ee22c6bcef (commit)
via d1e7a46ad99e411a20740ffa651f9affee9ae427 (commit)
from 2c0f3a34e5bd163b5194da61c9d1c0d89dc4f68d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fde927b36aa8972da15fefa3e0f01ee22c6bcef
commit 0fde927b36aa8972da15fefa3e0f01ee22c6bcef
Merge: 2c0f3a3 d1e7a46
Author: Stephen Kelly
AuthorDate: Sun Oct 16 06:09:30 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 16 06:09:30 2016 -0400
Merge topic 'extract-computed-target-properties' into next
d1e7a46a fixup! cmTarget: Move sanity checks and computed property access
to callers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1e7a46ad99e411a20740ffa651f9affee9ae427
commit d1e7a46ad99e411a20740ffa651f9affee9ae427
Author: Stephen Kelly
AuthorDate: Sun Oct 16 12:08:55 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 16 12:08:55 2016 +0200
fixup! cmTarget: Move sanity checks and computed property access to callers
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index b38950a..0a59933 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -10,6 +10,16 @@
#include "cmTest.h"
#include "cmake.h"
+#ifdef __clang__
+extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild(
+ cmTarget const* tgt);
+extern template const char* cmTargetPropertyComputer::ComputeLocation(
+ cmTarget const* tgt, std::string const& config);
+extern template const char* cmTargetPropertyComputer::GetSources(
+ cmTarget const* tgt, cmMessenger* messenger,
+ cmListFileBacktrace const& context);
+#endif
+
cmGetPropertyCommand::cmGetPropertyCommand()
{
this->InfoType = OutValue;
diff --git a/Source/cmGetTargetPropertyCommand.cxx
b/Source/cmGetTargetPropertyCommand.cxx
index 94f8942..d009bc3 100644
--- a/Source/cmGetTargetPropertyCommand.cxx
+++ b/Source/cmGetTargetPropertyCommand.cxx
@@ -4,6 +4,16 @@
#include "cmTargetPropertyComputer.h"
+#ifdef __clang__
+extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild(
+ cmTarget const* tgt);
+extern template const char* cmTargetPropertyComputer::ComputeLocation(
+ cmTarget const* tgt, std::string const& config);
+extern template const char* cmTargetPropertyComputer::GetSources(
+ cmTarget const* tgt, cmMessenger* messenger,
+ cmListFileBacktrace const& context);
+#endif
+
// cmSetTargetPropertyCommand
bool cmGetTargetPropertyCommand::InitialPass(
std::vector const& args, cmExecutionStatus&)
---
Summary of changes:
Source/cmGetPropertyCommand.cxx | 10 ++
Source/cmGetTargetPropertyCommand.cxx | 10 ++
2 files changed, 20 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
