[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-644-g50eb6cf
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 50eb6cf42322dafb0b9f53ac02f956e69a4be188 (commit)
via bd4f7bd88af4dd062f953b8f102e55aca098edc1 (commit)
from db659b69cddd639e4c44bdb4e4d53a06e424fc8b (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=50eb6cf42322dafb0b9f53ac02f956e69a4be188
commit 50eb6cf42322dafb0b9f53ac02f956e69a4be188
Merge: db659b6 bd4f7bd
Author: Stephen Kelly
AuthorDate: Wed Oct 19 09:40:45 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 19 09:40:45 2016 -0400
Merge topic 'split-cmState' into next
bd4f7bd8 Fix style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4f7bd88af4dd062f953b8f102e55aca098edc1
commit bd4f7bd88af4dd062f953b8f102e55aca098edc1
Author: Stephen Kelly
AuthorDate: Wed Oct 19 15:39:12 2016 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 19 15:40:17 2016 +0200
Fix style
diff --git a/Source/cmTargetPropertyComputer.cxx
b/Source/cmTargetPropertyComputer.cxx
index 0839439..36d1940 100644
--- a/Source/cmTargetPropertyComputer.cxx
+++ b/Source/cmTargetPropertyComputer.cxx
@@ -83,8 +83,8 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
}
bool cmTargetPropertyComputer::PassesWhitelist(
- cmStateEnums::TargetType tgtType, std::string const& prop, cmMessenger*
messenger,
- cmListFileBacktrace const& context)
+ cmStateEnums::TargetType tgtType, std::string const& prop,
+ cmMessenger* messenger, cmListFileBacktrace const& context)
{
if (tgtType == cmStateEnums::INTERFACE_LIBRARY &&
!WhiteListedInterfaceProperty(prop)) {
---
Summary of changes:
Source/cmTargetPropertyComputer.cxx |4 ++--
1 file 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-
[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;
[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-
[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
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-531-g2c0f3a3
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 2c0f3a34e5bd163b5194da61c9d1c0d89dc4f68d (commit)
via b59b6dd9d27de7839c7b23a3094db33298038896 (commit)
via b4234e977f65ee7df8adcd3888706dfd0dda (commit)
via f796e1b6f6984b200453a13e6b8640353ff9488b (commit)
via c75a9d660169ddd1e7be57486d3813ca73886b55 (commit)
via 46ad0d2183230d1af93242efbdcce20d55514efb (commit)
via 2628dec12cb22546d2a21032f53fb0ef096faec8 (commit)
via 315b9a31895ca6bb26eba12bff3a0fe9cd37568a (commit)
via d5feb5b34cd9f595bf42aa934738b918785e3e87 (commit)
via efba22e1deebcfc3924d5f14c026104eb4b62d28 (commit)
via b29425f7aafe07eff526f3c7defb317856b72984 (commit)
via f009d8f5e2e4007b93494c5d22ba25b41a4872a1 (commit)
via 6cd27a853a1c77e5da0a9a14140284a7674cf18c (commit)
via 8b0e4795687a2ea289d1313db24d75bcf3cd13bc (commit)
via 88016e2e9f13d60c4a0b88fb64ffd802a2d9e534 (commit)
via be87cb0c444595fa1970e257031252669c201d3e (commit)
via 425cd1670fdd40b752af71e5f28952ae4fcec4ac (commit)
from 590f2a365ed4ee2cc3a7fd93f55b2ab869fc3004 (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=2c0f3a34e5bd163b5194da61c9d1c0d89dc4f68d
commit 2c0f3a34e5bd163b5194da61c9d1c0d89dc4f68d
Merge: 590f2a3 b59b6dd
Author: Stephen Kelly
AuthorDate: Sat Oct 15 05:26:07 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 15 05:26:07 2016 -0400
Merge topic 'extract-cmRulePlaceholderExpander' into next
b59b6dd9 cmRulePlaceholderExpander: Port clients to direct-use
b423 cmRulePlaceholderExpander: Extract from cmLocalGenerator
f796e1b6 cmLocalGenerator: Move memset to cxx file
c75a9d66 cmLocalGenerator: Use strings instead of a Target in rule
replacement
46ad0d21 cmLocalGenerator: Use a converter in rule replacement API
2628dec1 cmLocalGenerator: Store variable replacements as state
315b9a31 cmLocalGenerator: Merge loops which populate mapping
d5feb5b3 cmLocalGenerator: Populate variable mapping for all replacements
efba22e1 cmLocalGenerator: Extract compiler option replacement from loop
b29425f7 cmLocalGenerator: Populate a container of mappings for replacements
f009d8f5 cmLocalGenerator: Move compiler option handling to be more direct
6cd27a85 cmLocalGenerator: Move variable to where it can be used easily
8b0e4795 cmLocalGenerator: Use the language from the compiler container
88016e2e cmLocalGenerator: Introduce a container of compiler names
be87cb0c cmLocalGenerator: Simplify loop with range algorithm
425cd167 cmLocalGenerator: Remove the launcher from RuleVariables
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59b6dd9d27de7839c7b23a3094db33298038896
commit b59b6dd9d27de7839c7b23a3094db33298038896
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:34:50 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 15 11:25:12 2016 +0200
cmRulePlaceholderExpander: Port clients to direct-use
Add a factory function to cmLocalGenerator so that variableMappings can
be provided from it, and so that Ninja can always have a hard-coded
TargetImpLib.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 615168d..1c3a97d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -133,6 +133,13 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
cmMakefile* makefile)
}
}
+cmRulePlaceholderExpander* cmLocalGenerator::CreateRulePlaceholderExpander()
+ const
+{
+ return new cmRulePlaceholderExpander(this->Compilers, this->VariableMappings,
+ this->CompilerSysroot);
+}
+
cmLocalGenerator::~cmLocalGenerator()
{
cmDeleteAll(this->GeneratorTargets);
@@ -561,17 +568,6 @@ cmState::Snapshot cmLocalGenerator::GetStateSnapshot()
const
return this->Makefile->GetStateSnapshot();
}
-void cmLocalGenerator::ExpandRuleVariables(cmOutputConverter* outputConverter,
- std::string& s,
- const RuleVariables& replaceValues)
-{
- cmRulePlaceholderExpander rulePlaceholderExpander(
-this->Compilers, this->VariableMappings, this->CompilerSysroot);
- rulePlaceholderExpander.SetTargetImpLib(this->TargetImplib);
- rulePlaceholderExpander.ExpandRuleVariables(outputConverter, s,
- replaceValues);
-}
-
const char* c
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-514-g590f2a3
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 590f2a365ed4ee2cc3a7fd93f55b2ab869fc3004 (commit)
via a5dfe2391b8d60fc2f6b5778687a9a338b6ed561 (commit)
via a365ab39a149ee2d71804e8dfd9a8c4636db9fac (commit)
via d409cb7bb7724b742efaa289d9183f5f5a840638 (commit)
via fa9dbc56a15aec71ac2eda7890efd0116797f373 (commit)
via 848ae2a663ef83e059561d94b33d551154642231 (commit)
via a0a720e6a70133e361762101ce69a0b3f1ab244d (commit)
via 637e3f3ee131cf30f7337db06314f4a1af22c245 (commit)
via 05251e6d80b03ae14d6a89765f14c2eb10979bd4 (commit)
via fbf1721c94b40ea86eeb183a1916f2066eb64bdc (commit)
via 390a7d8647c13570dc6416fceb884dc51c8ef6f9 (commit)
via e32a6bdd990571bafb8537110128d28a593150b7 (commit)
via 7863fba1f6f37db2f75834d0d6a3fbbc680e731c (commit)
via 8096682e4edb542a48bbf66c085911db5f00be02 (commit)
via 7d57c1a2c926011bc2e4c7a65b802763ec4efbcb (commit)
via a55cac4ba475ff61da4146272246512a52247323 (commit)
via 705fcf522be16eee03b1757274b23ada6547e6bd (commit)
via 1fb6f672bd2bd041edb772b0627278383a00fb62 (commit)
via 60b3f216c18aa317656433bcc0b724e6abd8d02f (commit)
via aaa5dbbf64392dad518668ac1d046d624dac41f3 (commit)
from 749587d10ed558c20e8f45d2190999ebdda6c9c9 (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=590f2a365ed4ee2cc3a7fd93f55b2ab869fc3004
commit 590f2a365ed4ee2cc3a7fd93f55b2ab869fc3004
Merge: 749587d a5dfe23
Author: Stephen Kelly
AuthorDate: Sat Oct 15 05:14:52 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 15 05:14:52 2016 -0400
Merge topic 'extract-computed-target-properties' into next
a5dfe239 cmTarget: Implement GetProperty in terms of cmState::Snapshot
a365ab39 cmTarget: Group code for checking written properties together
d409cb7b cmTarget: Move sanity checks and computed property access to
callers
fa9dbc56 cmGeneratorTarget: Implement cmTargetPropertyComputer interface
848ae2a6 cmTargetPropertyComputer: Template some methods on the Target
a0a720e6 cm{,Generator}Target: Add global generator accessors
637e3f3e cmTargetPropertyComputer: Unify whitelist handling from cmTarget
05251e6d cmTargetPropertyComputer: Move whitelist check from cmTarget
fbf1721c cmTargetPropertyComputer: Extract into new files
390a7d86 cmTargetPropertyComputer: Implement GetProperty without cmMakefile
e32a6bdd cmListFileBacktrace: Add a method to retrieve the Bottom of a
snapshot
7863fba1 cmTarget: Extract GetLocation method
8096682e cmTarget: Extract GetSources method
7d57c1a2 cmTarget: Extract location computation methods
a55cac4b cmTarget: Split property computation into separate class
705fcf52 cmTarget: Move IMPORTED check to callers
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5dfe2391b8d60fc2f6b5778687a9a338b6ed561
commit a5dfe2391b8d60fc2f6b5778687a9a338b6ed561
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 15 11:14:21 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=a365ab39a149ee2d71804e8dfd9a8c4636db9fac
commit a365ab39a149ee2d71804e8dfd9a8c4636db9fac
Author: Stephen Kelly
AuthorDate: Thu Oct 13 00:18:26 2016
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-394-g67c528c
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 67c528c03d2c598e4922f932c5598d5da91bc408 (commit)
via 6f0cee13fdadd4573e9dd57c1713d9a674abb713 (commit)
via a60ea0a957978495bd8a2dacb17447ef9e0bc694 (commit)
via 8b3af6a7ca2d4938568df8dc70c9d44c62ba9fe1 (commit)
via 49afda6b4e94d7747058bf5174bda6c333c921c6 (commit)
via 91bc8ec9b8941f15c9adca532afa2dea9d1c1fa1 (commit)
via 3743af8aa6db573370b5f4d10b06d35ab507b894 (commit)
via 780b5ea7c5b416e17f469235c08679fa3417262b (commit)
via b9badf851e865ef7076abb49904785b026909a49 (commit)
via b2c6630c566344c4289cf312adfa45f939820f54 (commit)
from 17bef2cd6780731f77be1383f74ddb5d9c44bffc (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=67c528c03d2c598e4922f932c5598d5da91bc408
commit 67c528c03d2c598e4922f932c5598d5da91bc408
Merge: 17bef2c 6f0cee1
Author: Stephen Kelly
AuthorDate: Mon Oct 10 18:44:22 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 10 18:44:22 2016 -0400
Merge topic 'extract-cmRulePlaceholderExpander' into next
6f0cee13 cmRulePlaceholderExpander: Port clients to direct-use
a60ea0a9 cmRulePlaceholderExpander: Extract from cmLocalGenerator
8b3af6a7 cmLocalGenerator: Use strings instead of a Target in rule
replacement
49afda6b cmLocalGenerator: Use a converter in rule replacement API
91bc8ec9 cmLocalGenerator: Store variable replacements as state
3743af8a cmLocalGenerator: Merge loops which populate mapping
780b5ea7 cmLocalGenerator: Populate variable mapping for all replacements
b9badf85 cmLocalGenerator: Extract compiler option replacement from loop
b2c6630c cmLocalGenerator: Populate a container of mappings for replacements
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f0cee13fdadd4573e9dd57c1713d9a674abb713
commit 6f0cee13fdadd4573e9dd57c1713d9a674abb713
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:34:50 2016 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 11 00:43:48 2016 +0200
cmRulePlaceholderExpander: Port clients to direct-use
Add a factory function to cmLocalGenerator so that variableMappings can
be provided from it, and so that Ninja can always have a hard-coded
TargetImpLib.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 615168d..1c3a97d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -133,6 +133,13 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
cmMakefile* makefile)
}
}
+cmRulePlaceholderExpander* cmLocalGenerator::CreateRulePlaceholderExpander()
+ const
+{
+ return new cmRulePlaceholderExpander(this->Compilers, this->VariableMappings,
+ this->CompilerSysroot);
+}
+
cmLocalGenerator::~cmLocalGenerator()
{
cmDeleteAll(this->GeneratorTargets);
@@ -561,17 +568,6 @@ cmState::Snapshot cmLocalGenerator::GetStateSnapshot()
const
return this->Makefile->GetStateSnapshot();
}
-void cmLocalGenerator::ExpandRuleVariables(cmOutputConverter* outputConverter,
- std::string& s,
- const RuleVariables& replaceValues)
-{
- cmRulePlaceholderExpander rulePlaceholderExpander(
-this->Compilers, this->VariableMappings, this->CompilerSysroot);
- rulePlaceholderExpander.SetTargetImpLib(this->TargetImplib);
- rulePlaceholderExpander.ExpandRuleVariables(outputConverter, s,
- replaceValues);
-}
-
const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target,
const std::string& prop)
{
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6f8426d..055e1a9 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -24,6 +24,7 @@ class cmComputeLinkInformation;
class cmCustomCommandGenerator;
class cmGeneratorTarget;
class cmGlobalGenerator;
+class cmRulePlaceholderExpander;
class cmMakefile;
class cmSourceFile;
class cmLinkLineComputer;
@@ -85,6 +86,8 @@ public:
return this->GlobalGenerator;
}
+ virtual cmRulePlaceholderExpander* CreateRulePlaceholderExpander() const;
+
std::string GetLinkLibsCMP0065(std::string const& linkLanguage,
cmGeneratorTarget& tgt) const;
@@ -218,10 +221,6 @@ public:
// preprocessed files and assembly files.
void GetIndividualFileTargets(std::vector&) {}
- struct RuleVaria
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-384-g17bef2c
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 17bef2cd6780731f77be1383f74ddb5d9c44bffc (commit)
via 9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9 (commit)
from 885c6f5f348a45174cf5e3a799dc8c0f13c37e67 (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=17bef2cd6780731f77be1383f74ddb5d9c44bffc
commit 17bef2cd6780731f77be1383f74ddb5d9c44bffc
Merge: 885c6f5 9dcfa5f
Author: Stephen Kelly
AuthorDate: Mon Oct 10 18:05:12 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 10 18:05:12 2016 -0400
Merge topic 'extract-cmRulePlaceholderExpander' into next
9dcfa5f0 Fix output bug
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9
commit 9dcfa5f09b2b6345c3a83612a69d3e94bc43aac9
Author: Stephen Kelly
AuthorDate: Tue Oct 11 00:04:49 2016 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 11 00:04:49 2016 +0200
Fix output bug
diff --git a/Source/cmRulePlaceholderExpander.cxx
b/Source/cmRulePlaceholderExpander.cxx
index 796c975..601c3b4 100644
--- a/Source/cmRulePlaceholderExpander.cxx
+++ b/Source/cmRulePlaceholderExpander.cxx
@@ -204,8 +204,8 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable(
this->Compilers.find(variable);
if (compIt != this->Compilers.end()) {
-std::string ret =
- this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"];
+std::string ret = outputConverter->ConvertToOutputForExisting(
+ this->VariableMappings["CMAKE_" + compIt->second + "_COMPILER"]);
std::string const& compilerArg1 =
this->VariableMappings[compIt->first + "_COMPILER_ARG1"];
std::string const& compilerTarget =
---
Summary of changes:
Source/cmRulePlaceholderExpander.cxx |4 ++--
1 file 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-382-g885c6f5
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 885c6f5f348a45174cf5e3a799dc8c0f13c37e67 (commit)
via ca40503553b08255ae8a67168ee840b9e7487011 (commit)
via 8bb3d57e7eaa89fb394e33aa29849ee559f29915 (commit)
via 0cd57caf76abd5560cf09b12c4e894e505980948 (commit)
via fd5440694f9dd2d9d1d70d6bcd58a928c8d2e912 (commit)
via adee2f4b870ad5aa27437feaf7360ae984afcf27 (commit)
via 3855acab5f925de761e384007592f54b471eeacd (commit)
via 331e584c686e3a20708287d807f18a60d64568b0 (commit)
via 76624fb8470bdc63b3844f84edc3c941bc524f41 (commit)
via 5e5c1c9224b7b10df29732ab16d7fbc052faba40 (commit)
via 881c15b360a11f4951ba185e54fbaf8ec028b237 (commit)
via 7c4ce8062620e6d1375316a5c8966690c475fc2a (commit)
via beac5cbd01a48e0d53114ee0156f79108a6ab6ac (commit)
via b2fa025ce3d264d9f3313a83ef77a0ded398d07f (commit)
via 4bc4312ca064a82b3ac157ef0b67235e5cb02afc (commit)
via d7f6a6164e7775eeabec0aa5d66c81a365b3d1f1 (commit)
from e5c68d04f4eb28ab4f967fe1f127be6b28c0ec92 (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=885c6f5f348a45174cf5e3a799dc8c0f13c37e67
commit 885c6f5f348a45174cf5e3a799dc8c0f13c37e67
Merge: e5c68d0 ca40503
Author: Stephen Kelly
AuthorDate: Mon Oct 10 17:23:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 10 17:23:44 2016 -0400
Merge topic 'extract-cmRulePlaceholderExpander' into next
ca405035 cmRulePlaceholderExpander: Port clients to direct-use
8bb3d57e cmRulePlaceholderExpander: Extract from cmLocalGenerator
0cd57caf cmLocalGenerator: Use strings instead of a Target in rule
replacement
fd544069 cmLocalGenerator: Use a converter in rule replacement API
adee2f4b cmLocalGenerator: Store variable replacements as state
3855acab cmLocalGenerator: Merge loops which populate mapping
331e584c cmLocalGenerator: Populate variable mapping for all replacements
76624fb8 cmLocalGenerator: Extract compiler option replacement from loop
5e5c1c92 cmLocalGenerator: Populate a container of mappings for replacements
881c15b3 cmLocalGenerator: Move compiler option handling to be more direct
7c4ce806 cmLocalGenerator: Move variable to where it can be used easily
beac5cbd cmLocalGenerator: Use the language from the compiler container
b2fa025c cmLocalGenerator: Introduce a container of compiler names
4bc4312c cmLocalGenerator: Simplify loop with range algorithm
d7f6a616 cmLocalGenerator: Remove the launcher from RuleVariables
diff --cc Source/cmMakefileLibraryTargetGenerator.cxx
index 8a621ea,9f5f0c1..cb8b5e8
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@@ -595,10 -609,25 +597,20 @@@ void cmMakefileLibraryTargetGenerator::
this->LocalGenerator->AddArchitectureFlags(
langFlags, this->GeneratorTarget, linkLanguage, this->ConfigName);
-// remove any language flags that might not work with the
-// particular os
-if (forbiddenFlagVar) {
- this->RemoveForbiddenFlags(forbiddenFlagVar, linkLanguage, langFlags);
-}
vars.LanguageCompileFlags = langFlags.c_str();
+ std::string launcher;
+ const char* val = this->LocalGenerator->GetRuleLauncher(
+ this->GeneratorTarget, "RULE_LAUNCH_LINK");
+ if (val && *val) {
+ launcher = val;
+ launcher += " ";
+ }
+
+ CM_AUTO_PTR rulePlaceholderExpander(
+ this->LocalGenerator->CreateRulePlaceholderExpander());
// Construct the main link rule and expand placeholders.
- this->LocalGenerator->TargetImplib = targetOutPathImport;
+ rulePlaceholderExpander->SetTargetImpLib(targetOutPathImport);
if (useArchiveRules) {
// Construct the individual object list strings.
std::vector object_strings;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca40503553b08255ae8a67168ee840b9e7487011
commit ca40503553b08255ae8a67168ee840b9e7487011
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:34:50 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Oct 10 21:58:50 2016 +0200
cmRulePlaceholderExpander: Port clients to direct-use
Add a factory function to cmLocalGenerator so that variableMappings can
be provided from it, and so that Ninja can always have a hard-coded
TargetImpLib.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 615168d..1c3a97d 100644
--- a/Source/cmLocalGenerator.cxx
++
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-360-gf62d2c8
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 f62d2c869f7ebbb418bde71bff2ecbfc7a3993b2 (commit)
via 4134030434ea88024ef46f9f00b19513fc3cec4c (commit)
via f03d446e967af91460ff31eb52d840983b3d8cec (commit)
via 3444105f9fe4fcee390c8d616e1a211a078a630b (commit)
via 77c4202edc242c96087295585a85a20700bdb26f (commit)
via 09b6cc66b09b9689ca01faee5e33ef101b46f972 (commit)
via 0c978063259fb013856b617d680cebcdee51ab1a (commit)
via 0152a01f11fc46f645fd765cc7b1be76cc07b52a (commit)
via 011e6870e4a7f19476c162a8c011fd018d9a7e9c (commit)
via cbca80f3516d7e5b2def6105a1b26b44bad7b6fe (commit)
via d48f69d0f5f265d1c091a614098cae3ff4325fbe (commit)
via ff8e321c6ade784b3f1b3b19a7783788872e44a9 (commit)
via 80f57e67eefc905a726f2f35bd1672a188ea4c99 (commit)
via 7ef834682547df5e0ccdcd503558dcbf1206a638 (commit)
via 69295812065a5d07c07347add2fdcf8f36f993ba (commit)
via 5b361fdda0f2808f0368b746a880981ebda0ade0 (commit)
via 2e5d1990f382aa42e8a0ad34117ee1e5a9187153 (commit)
via b3701f9a5213f2ff5b2bc197e9af5d1f2ff68a9c (commit)
from dd75faf01aecc93c32cbc5941d29033e33af0521 (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=f62d2c869f7ebbb418bde71bff2ecbfc7a3993b2
commit f62d2c869f7ebbb418bde71bff2ecbfc7a3993b2
Merge: dd75faf 4134030
Author: Stephen Kelly
AuthorDate: Mon Oct 10 14:44:12 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 10 14:44:12 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
41340304 cmLinkLineComputer: Extract link libraries computation from
cmLocalGenerator
f03d446e cmLinkLineComputer: Move FrameworkPath computation from
cmLocalGenerator
3444105f cmLocalGenerator: Inline last use of local variable
77c4202e cmLinkLineComputer: Move RPath computation from cmLocalGenerator
09b6cc66 cmLinkLineComputer: Move LinkPath computation from cmLocalGenerator
0c978063 cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator
0152a01f cmLocalGenerator: Move variable to where it is used
011e6870 cmLocalGenerator: Use a std::string instead of char*
cbca80f3 cmLocalGenerator: Move stringstream to where it is used
d48f69d0 cmLocalGenerator: Move flag determination up in the function
ff8e321c cmLocalGenerator: Separate stdlib content from library stream
80f57e67 cmLocalGenerator: Separate rpath content from library stream
7ef83468 cmLocalGenerator: Pass link library info to OutputLinkLibraries
69295812 Makefiles: Port CreateLinkLibs to cmLinkLineComputer
5b361fdd cmLinkLineComputer: Extract from cmLocalGenerator
2e5d1990 Ninja: Constify
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4134030434ea88024ef46f9f00b19513fc3cec4c
commit 4134030434ea88024ef46f9f00b19513fc3cec4c
Author: Stephen Kelly
AuthorDate: Sat Oct 8 12:21:39 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Oct 10 20:38:59 2016 +0200
cmLinkLineComputer: Extract link libraries computation from cmLocalGenerator
Hide some methods which no longer need to be public.
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 41096ef..24f3578 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -152,3 +152,28 @@ std::string cmLinkLineComputer::ComputeFrameworkPath(
}
return frameworkPath;
}
+
+std::string cmLinkLineComputer::ComputeLinkLibraries(
+ cmComputeLinkInformation& cli, std::string const& stdLibString)
+{
+ std::ostringstream fout;
+ fout << this->ComputeRPath(cli);
+
+ // Write the library flags to the build rule.
+ fout << this->ComputeLinkLibs(cli);
+
+ // Add the linker runtime search path if any.
+ std::string rpath_link = cli.GetRPathLinkString();
+ if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
+fout << cli.GetRPathLinkFlag();
+fout << this->OutputConverter->EscapeForShell(rpath_link,
+ !this->ForResponse);
+fout << " ";
+ }
+
+ if (!stdLibString.empty()) {
+fout << stdLibString << " ";
+ }
+
+ return fout.str();
+}
diff --git a/Source/cmLinkLineComputer.h b/Source/cmLinkLineComputer.h
index f72368a..1fb9b24 100644
--- a/Source/cmLinkLineComputer.h
+++ b/Source/cmLinkLineComputer.h
@@ -22,18 +22,20 @@ public:
virtual std::string ConvertToLinkReference(std::string const& input) const;
- std::
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-304-gc238285
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 c2382855e6a9706c9f71beb1f57bfafc75587f65 (commit)
via 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9 (commit)
from 6b05e33c95b2bb392f6c6602da4677747613e35d (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=c2382855e6a9706c9f71beb1f57bfafc75587f65
commit c2382855e6a9706c9f71beb1f57bfafc75587f65
Merge: 6b05e33 7f13f7a
Author: Stephen Kelly
AuthorDate: Sun Oct 9 07:14:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 9 07:14:44 2016 -0400
Merge topic 'minor-cleanups' into next
7f13f7a9 fixup! cmLocalGenerator: Extract definition retrieval out of loop
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
commit 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
Author: Stephen Kelly
AuthorDate: Sun Oct 9 13:14:25 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 13:14:25 2016 +0200
fixup! cmLocalGenerator: Extract definition retrieval out of loop
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0a99e87..025b82a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1176,7 +1176,8 @@ void cmLocalGenerator::GetTargetFlags(
!(this->Makefile->IsOn("CYGWIN") || this->Makefile->IsOn("MINGW"))) {
std::vector sources;
target->GetSourceFiles(sources, buildType);
-std::string defFlag =
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
+std::string defFlag =
+ this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
for (std::vector::const_iterator i = sources.begin();
i != sources.end(); ++i) {
cmSourceFile* sf = *i;
---
Summary of changes:
Source/cmLocalGenerator.cxx |3 ++-
1 file changed, 2 insertions(+), 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-302-g6b05e33
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 6b05e33c95b2bb392f6c6602da4677747613e35d (commit)
via 5de760147f83b507f5b5dda7051eb1f6386e052b (commit)
via 95ac050958f063223a4a3f660aa5d8521b089c3f (commit)
via 6e3b88962c6762ab384ef73c9a77444ace4b0738 (commit)
via 2a49d86d5dec66f7696bd7063459f504cc336a5e (commit)
via b0301db23b12351720993a351fedf081ca0fa444 (commit)
via 267e02097e90d05a16ffd1aa53fb7910b79aa0ec (commit)
via 009019f2596de08c488588fd2c67a423f9fe92bf (commit)
via 378849f41e574e72c577b549dfc2d5333ca8f9b5 (commit)
via 4a3c49b4698f0e8c20c345770f551142088a3037 (commit)
from 2f5c30a55bdabcf606b26abb89395608170f9ae2 (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=6b05e33c95b2bb392f6c6602da4677747613e35d
commit 6b05e33c95b2bb392f6c6602da4677747613e35d
Merge: 2f5c30a 5de7601
Author: Stephen Kelly
AuthorDate: Sun Oct 9 04:49:00 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 9 04:49:00 2016 -0400
Merge topic 'minor-cleanups' into next
5de76014 cmMakefile: Return a string from GetDefineFlags
95ac0509 Test: Remove condition for CMake version no longer supported
6e3b8896 cmLocalGenerator: Extract definition retrieval out of loop
2a49d86d Makefiles: Inline only use of method
b0301db2 Makefiles: Make helper class independent of cmLocalGenerator
267e0209 cmMakefile: Remove pointless condition
009019f2 Makefiles: Extract identical code from condition
378849f4 Makefiles: Replace array access with local variable
4a3c49b4 Makefiles: Separate two coupled calls
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de760147f83b507f5b5dda7051eb1f6386e052b
commit 5de760147f83b507f5b5dda7051eb1f6386e052b
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:47:45 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 10:47:45 2016 +0200
cmMakefile: Return a string from GetDefineFlags
Flip condition in GHS for readability.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index 959dfdb..fac68f5 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -244,7 +244,7 @@ void
cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config,
flags, this->GeneratorTarget, lang);
// Append old-style preprocessor definition flags.
-if (std::string(" ") != std::string(this->Makefile->GetDefineFlags())) {
+if (this->Makefile->GetDefineFlags() != " ") {
this->LocalGenerator->AppendFlags(flags,
this->Makefile->GetDefineFlags());
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 40344ce..de7bead 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -447,7 +447,7 @@ public:
/**
* Get a list of preprocessor define flags.
*/
- const char* GetDefineFlags() const { return this->DefineFlags.c_str(); }
+ std::string GetDefineFlags() const { return this->DefineFlags; }
/**
* Make sure CMake can write this file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95ac050958f063223a4a3f660aa5d8521b089c3f
commit 95ac050958f063223a4a3f660aa5d8521b089c3f
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:47:44 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 10:47:44 2016 +0200
Test: Remove condition for CMake version no longer supported
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 56fcc5d..23832da 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -20,16 +20,9 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake
@ONLY)
# now set up the test:
-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
- file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-CONTENT "CMAKE = \"$\"\n"
- )
-else()
- get_target_property(cmakeLocation cmake LOCATION)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-"CMAKE = \"${cmakeLocation}\"\n"
- )
-endif()
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
+ CONTENT "CMAKE = \"$\"\n"
+)
configure_file(${CMA
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-292-g2f5c30a
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 2f5c30a55bdabcf606b26abb89395608170f9ae2 (commit) via 65ca5dfc857fd295495941a65ce3862675f50d59 (commit) from 9ba2a76c8636156de00496f62a4d9d2be85b1b56 (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=2f5c30a55bdabcf606b26abb89395608170f9ae2 commit 2f5c30a55bdabcf606b26abb89395608170f9ae2 Merge: 9ba2a76 65ca5df Author: Stephen Kelly AuthorDate: Sat Oct 8 19:09:55 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Oct 8 19:09:55 2016 -0400 Merge topic 'extract-cmLinkLineComputer' into next 65ca5dfc fixup! cmLinkLineComputer: Extract from cmLocalGenerator https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65ca5dfc857fd295495941a65ce3862675f50d59 commit 65ca5dfc857fd295495941a65ce3862675f50d59 Author: Stephen Kelly AuthorDate: Sun Oct 9 01:09:29 2016 +0200 Commit: Stephen Kelly CommitDate: Sun Oct 9 01:09:29 2016 +0200 fixup! cmLinkLineComputer: Extract from cmLocalGenerator diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 7bafbb0..dd8b36f 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -5,6 +5,7 @@ #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalGhsMultiGenerator.h" +#include "cmLinkLineComputer.h" #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" --- Summary of changes: Source/cmGhsMultiTargetGenerator.cxx |1 + 1 file changed, 1 insertion(+) 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-290-g9ba2a76
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 9ba2a76c8636156de00496f62a4d9d2be85b1b56 (commit) via 8d9daade39b9ebb190f32597469910a70a8131d0 (commit) from 0428c729ec5203a1887bbb078940a4fc0ad20be0 (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=9ba2a76c8636156de00496f62a4d9d2be85b1b56 commit 9ba2a76c8636156de00496f62a4d9d2be85b1b56 Merge: 0428c72 8d9daad Author: Stephen Kelly AuthorDate: Sat Oct 8 17:25:56 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Oct 8 17:25:56 2016 -0400 Merge topic 'extract-cmLinkLineComputer' into next 8d9daade fixup! cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d9daade39b9ebb190f32597469910a70a8131d0 commit 8d9daade39b9ebb190f32597469910a70a8131d0 Author: Stephen Kelly AuthorDate: Sat Oct 8 23:25:38 2016 +0200 Commit: Stephen Kelly CommitDate: Sat Oct 8 23:25:38 2016 +0200 fixup! cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index acf06e4..7bafbb0 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -363,8 +363,8 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries( bool useWatcomQuote = this->Makefile->IsOn(createRule + "_USE_WATCOM_QUOTE"); CM_AUTO_PTR linkLineComputer( - this->LocalGenerator, this->GetGlobalGenerator()->CreateLinkLineComputer( +this->LocalGenerator, this->LocalGenerator->GetStateSnapshot().GetDirectory())); linkLineComputer->SetUseWatcomQuote(useWatcomQuote); --- Summary of changes: Source/cmGhsMultiTargetGenerator.cxx |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-288-g0428c72
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 0428c729ec5203a1887bbb078940a4fc0ad20be0 (commit)
via ae6ee87520349c432aad6f1dfa987a1cc630eacd (commit)
from 742fcc25999fa30d348dc6df35cd07ecbdcb6fe9 (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=0428c729ec5203a1887bbb078940a4fc0ad20be0
commit 0428c729ec5203a1887bbb078940a4fc0ad20be0
Merge: 742fcc2 ae6ee87
Author: Stephen Kelly
AuthorDate: Sat Oct 8 16:28:51 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 8 16:28:51 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
ae6ee875 fixup! Makefiles: Port CreateLinkLibs to cmLinkLineComputer
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6ee87520349c432aad6f1dfa987a1cc630eacd
commit ae6ee87520349c432aad6f1dfa987a1cc630eacd
Author: Stephen Kelly
AuthorDate: Sat Oct 8 22:28:30 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 8 22:28:30 2016 +0200
fixup! Makefiles: Port CreateLinkLibs to cmLinkLineComputer
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c45ff7e..5c31e3e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1226,7 +1226,7 @@ void cmLocalGenerator::GetTargetFlags(
return;
}
this->AddLanguageFlags(flags, linkLanguage, buildType);
- if (!pcli) {
+ if (pcli) {
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
frameworkPath, linkPath);
}
---
Summary of changes:
Source/cmLocalGenerator.cxx |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-286-g742fcc2
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 742fcc25999fa30d348dc6df35cd07ecbdcb6fe9 (commit)
via b57b7870f6e188136ec0bae6ebc555c882feee90 (commit)
via 076d39926f899f88e30b4128c2c835ab35091a31 (commit)
via b06615050293a04b7e7ef8ccf97ec706351d761e (commit)
via 7a7a02193745d52183cdd203deb1a93d49f797e7 (commit)
via 639cbcdaf9e7dc5ae9e4156ec2f21ad1c8634acf (commit)
via 62e5fc1dbf477bb2628dee9d2e9bf143609f441b (commit)
via 37cab7eb17b505a18f534408307797a5e126663e (commit)
via 0e16f8f8067ae721d23e842b83e0e24d4e5d2b49 (commit)
via 47e6e46fcf85e73b65b0f93be4e1d9aeb72b9579 (commit)
via 2f81fb21790dac9f6036d804d68f108bb498b720 (commit)
via cc911145ee8a4a8bb1fcea6fecf77cba37fcf261 (commit)
via 2bfda685be5c8138d5b5d5c2366dc41665ef7064 (commit)
via ac5daf964a49edc00dc23c621cb5fbc6b9deca4e (commit)
via 61d7cc52ebd5bcaf9676a285268e1dc8c1131908 (commit)
via c5800af1919ce735267f1dca4e0d9c5234ca9ce3 (commit)
via dffcc796ef7759fcb6bdfad7c576adc88e60a7ca (commit)
via c12c7f35633c1b75e4ed2c84e021065fce82716d (commit)
via 8312fd5c1f82d5acc600c9d796ff99620cbbd3e1 (commit)
from 1991df2f67e587f01de2836f09015fc1983d1a45 (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=742fcc25999fa30d348dc6df35cd07ecbdcb6fe9
commit 742fcc25999fa30d348dc6df35cd07ecbdcb6fe9
Merge: 1991df2 b57b787
Author: Stephen Kelly
AuthorDate: Sat Oct 8 16:00:36 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 8 16:00:36 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
b57b7870 cmLinkLineComputer: Extract link libraries computation from
cmLocalGenerator
076d3992 cmLinkLineComputer: Move FrameworkPath computation from
cmLocalGenerator
b0661505 cmLocalGenerator: Inline last use of local variable
7a7a0219 cmLinkLineComputer: Move RPath computation from cmLocalGenerator
639cbcda cmLinkLineComputer: Move LinkPath computation from cmLocalGenerator
62e5fc1d cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator
37cab7eb cmLocalGenerator: Move variable to where it is used
0e16f8f8 cmLocalGenerator: Use a std::string instead of char*
47e6e46f cmLocalGenerator: Move stringstream to where it is used
2f81fb21 cmLocalGenerator: Move flag determination up in the function
cc911145 cmLocalGenerator: Separate stdlib content from library stream
2bfda685 cmLocalGenerator: Separate rpath content from library stream
ac5daf96 cmLocalGenerator: Pass link library info to OutputLinkLibraries
61d7cc52 Makefiles: Port CreateLinkLibs to cmLinkLineComputer
c5800af1 cmLinkLineComputer: Extract from cmLocalGenerator
dffcc796 Ninja: Constify
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b57b7870f6e188136ec0bae6ebc555c882feee90
commit b57b7870f6e188136ec0bae6ebc555c882feee90
Author: Stephen Kelly
AuthorDate: Sat Oct 8 12:21:39 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 8 13:47:24 2016 +0200
cmLinkLineComputer: Extract link libraries computation from cmLocalGenerator
Hide some methods which no longer need to be public.
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 41096ef..24f3578 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -152,3 +152,28 @@ std::string cmLinkLineComputer::ComputeFrameworkPath(
}
return frameworkPath;
}
+
+std::string cmLinkLineComputer::ComputeLinkLibraries(
+ cmComputeLinkInformation& cli, std::string const& stdLibString)
+{
+ std::ostringstream fout;
+ fout << this->ComputeRPath(cli);
+
+ // Write the library flags to the build rule.
+ fout << this->ComputeLinkLibs(cli);
+
+ // Add the linker runtime search path if any.
+ std::string rpath_link = cli.GetRPathLinkString();
+ if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
+fout << cli.GetRPathLinkFlag();
+fout << this->OutputConverter->EscapeForShell(rpath_link,
+ !this->ForResponse);
+fout << " ";
+ }
+
+ if (!stdLibString.empty()) {
+fout << stdLibString << " ";
+ }
+
+ return fout.str();
+}
diff --git a/Source/cmLinkLineComputer.h b/Source/cmLinkLineComputer.h
index f72368a..1fb9b24 100644
--- a/Source/cmLinkLineComputer.h
+++ b/Source/cmLinkLineComputer.h
@@ -22,18 +22,20 @@ public:
virtual std::string ConvertToLinkReference(s
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-267-g1991df2
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 1991df2f67e587f01de2836f09015fc1983d1a45 (commit)
via cc5e6b82c2ae8293a400b604e0366578f9097d94 (commit)
from e0f428248c51aacfc2b9e53cca5b88aa15042013 (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=1991df2f67e587f01de2836f09015fc1983d1a45
commit 1991df2f67e587f01de2836f09015fc1983d1a45
Merge: e0f4282 cc5e6b8
Author: Stephen Kelly
AuthorDate: Sat Oct 8 05:36:14 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 8 05:36:14 2016 -0400
Merge topic 'ninja-cleanups' into next
cc5e6b82 Ninja: Extract identical code from condition
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc5e6b82c2ae8293a400b604e0366578f9097d94
commit cc5e6b82c2ae8293a400b604e0366578f9097d94
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:32 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 8 11:36:02 2016 +0200
Ninja: Extract identical code from condition
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 22fae4c..b04c11d 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -492,10 +492,8 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher(
if (ccg.GetWorkingDirectory().empty()) {
output =
this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), output);
- output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
-} else {
- output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
}
+output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
}
vars.Output = output.c_str();
---
Summary of changes:
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-265-ge0f4282
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 e0f428248c51aacfc2b9e53cca5b88aa15042013 (commit)
via cfcf11093df6477b04e19dad4c4fa56f1032faa5 (commit)
from e8ce84727ed59d55c37adbf06cde0e2f114c46e1 (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=e0f428248c51aacfc2b9e53cca5b88aa15042013
commit e0f428248c51aacfc2b9e53cca5b88aa15042013
Merge: e8ce847 cfcf110
Author: Stephen Kelly
AuthorDate: Sat Oct 8 05:35:45 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 8 05:35:45 2016 -0400
Merge topic 'ninja-cleanups' into next
cfcf1109 Revert partially
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfcf11093df6477b04e19dad4c4fa56f1032faa5
commit cfcf11093df6477b04e19dad4c4fa56f1032faa5
Author: Stephen Kelly
AuthorDate: Sat Oct 8 11:34:31 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 8 11:35:22 2016 +0200
Revert partially
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 1b4e34c..f5a0e68 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -834,27 +834,9 @@ std::string
cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
{
cmLocalNinjaGenerator* ng =
static_cast(this->LocalGenerators[0]);
-
- return ConvertToNinjaPath(path, ng->GetStateSnapshot().GetDirectory(),
-this->OutputPathPrefix);
-}
-
-std::string cmGlobalNinjaGenerator::ConvertToNinjaPath(
- const std::string& path, cmState::Directory stateDir,
- std::string const& prefix)
-{
- std::string convPath = path;
-
- if (cmOutputConverter::ContainedInDirectory(stateDir.GetCurrentBinary(),
- path, stateDir)) {
-convPath = cmOutputConverter::ForceToRelativePath(
- stateDir.GetCurrentBinary(), path);
- }
-
- if (!cmSystemTools::FileIsFullPath(convPath)) {
-convPath = prefix + convPath;
- }
-
+ std::string convPath = ng->ConvertToRelativePath(
+this->LocalGenerators[0]->GetState()->GetBinaryDirectory(), path);
+ convPath = this->NinjaOutputPath(convPath);
#ifdef _WIN32
std::replace(convPath.begin(), convPath.end(), '/', '\\');
#endif
@@ -1441,7 +1423,7 @@ void cmGlobalNinjaGenerator::InitOutputPathPrefix()
std::string cmGlobalNinjaGenerator::NinjaOutputPath(std::string const& path)
{
- if (cmSystemTools::FileIsFullPath(path)) {
+ if (!this->HasOutputPathPrefix() || cmSystemTools::FileIsFullPath(path)) {
return path;
}
return this->OutputPathPrefix + path;
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 51a8032..dcf7406 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -233,9 +233,6 @@ public:
return this->RulesFileStream;
}
- static std::string ConvertToNinjaPath(const std::string& path,
-cmState::Directory stateDir,
-std::string const& prefix);
std::string ConvertToNinjaPath(const std::string& path);
std::string ConvertToNinjaFolderRule(const std::string& path);
---
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 26 --
Source/cmGlobalNinjaGenerator.h |3 ---
2 files changed, 4 insertions(+), 25 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-260-g1035d0e
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 1035d0e0d270301d266f2d20b39bf09fa3448972 (commit)
via a1cfc4fe3deed4d642773d0ae63dd524c3f2eba1 (commit)
via 4079ba20d9d9c8d15fd28d9440d56c907dda811c (commit)
via 17ab8e33f005aab3e493ac4535f63b6f229aacab (commit)
from d808f0fdad129f19f1607aa5585a5642fcecf01a (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=1035d0e0d270301d266f2d20b39bf09fa3448972
commit 1035d0e0d270301d266f2d20b39bf09fa3448972
Merge: d808f0f a1cfc4f
Author: Stephen Kelly
AuthorDate: Fri Oct 7 16:08:36 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 16:08:36 2016 -0400
Merge topic 'clean-up-link-configuration' into next
a1cfc4fe cmMakefile: Simplify programmer error to an assert
4079ba20 cmMakefile: Implement LinkLibraries as an internal property
17ab8e33 cmMakefile: Inline method into only remaining caller
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1cfc4fe3deed4d642773d0ae63dd524c3f2eba1
commit a1cfc4fe3deed4d642773d0ae63dd524c3f2eba1
Author: Stephen Kelly
AuthorDate: Fri Oct 7 20:13:37 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 22:08:03 2016 +0200
cmMakefile: Simplify programmer error to an assert
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 47d9b47..6ab45bb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1832,14 +1832,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string&
lname,
const std::vector& srcs,
bool excludeFromAll)
{
- // wrong type ? default to STATIC
- if ((type != cmState::STATIC_LIBRARY) && (type != cmState::SHARED_LIBRARY) &&
- (type != cmState::MODULE_LIBRARY) && (type != cmState::OBJECT_LIBRARY) &&
- (type != cmState::INTERFACE_LIBRARY)) {
-this->IssueMessage(cmake::INTERNAL_ERROR,
- "cmMakefile::AddLibrary given invalid target type.");
-type = cmState::STATIC_LIBRARY;
- }
+ assert(type == cmState::STATIC_LIBRARY || type == cmState::SHARED_LIBRARY ||
+ type == cmState::MODULE_LIBRARY || type == cmState::OBJECT_LIBRARY ||
+ type == cmState::INTERFACE_LIBRARY);
cmTarget* target = this->AddNewTarget(type, lname);
// Clear its dependencies. Otherwise, dependencies might persist
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4079ba20d9d9c8d15fd28d9440d56c907dda811c
commit 4079ba20d9d9c8d15fd28d9440d56c907dda811c
Author: Stephen Kelly
AuthorDate: Fri Oct 7 20:13:37 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 22:07:50 2016 +0200
cmMakefile: Implement LinkLibraries as an internal property
cmMakefile should not have logic particular to individual cmake
commands. The link_libraries() command is generally obsolete in favor
of target_link_libraries(). An alternative language for CMake probably
would not offer the former. The quirks and historical behaviors of the
current language should be separate from the core classes of CMake to
allow replacing the language.
diff --git a/Source/cmLinkLibrariesCommand.cxx
b/Source/cmLinkLibrariesCommand.cxx
index 3fc7bd9..4202cf5 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -20,7 +20,7 @@ bool
cmLinkLibrariesCommand::InitialPass(std::vector const& args,
"a library");
return false;
}
- this->Makefile->AddLinkLibrary(*i, DEBUG_LibraryType);
+ this->Makefile->AppendProperty("LINK_LIBRARIES", "debug");
} else if (*i == "optimized") {
++i;
if (i == args.end()) {
@@ -28,10 +28,9 @@ bool
cmLinkLibrariesCommand::InitialPass(std::vector const& args,
"a library");
return false;
}
- this->Makefile->AddLinkLibrary(*i, OPTIMIZED_LibraryType);
-} else {
- this->Makefile->AddLinkLibrary(*i, GENERAL_LibraryType);
+ this->Makefile->AppendProperty("LINK_LIBRARIES", "optimized");
}
+this->Makefile->AppendProperty("LINK_LIBRARIES", i->c_str());
}
return true;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6e451b6..47d9b47 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1207,15 +1207,6 @@ bool cmMakefile::ParseDefineFlag(std::string const& def,
bool remove)
return tr
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-256-gd808f0f
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 d808f0fdad129f19f1607aa5585a5642fcecf01a (commit)
via f17210aec9bf7db8272ab7ce7eea7addd07587fd (commit)
from 61e69451ace821aaa94a9ba2b2f4e15140222736 (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=d808f0fdad129f19f1607aa5585a5642fcecf01a
commit d808f0fdad129f19f1607aa5585a5642fcecf01a
Merge: 61e6945 f17210a
Author: Stephen Kelly
AuthorDate: Fri Oct 7 16:06:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 16:06:06 2016 -0400
Merge topic 'clean-up-link-configuration' into next
f17210ae Fix style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f17210aec9bf7db8272ab7ce7eea7addd07587fd
commit f17210aec9bf7db8272ab7ce7eea7addd07587fd
Author: Stephen Kelly
AuthorDate: Fri Oct 7 22:05:47 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 22:05:47 2016 +0200
Fix style
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index b2da329..56a469d 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -338,25 +338,22 @@ void CCONV cmAddCustomCommandToTarget(void* arg, const
char* target,
}
static void addLinkLibrary(cmMakefile* mf, std::string const& target,
- std::string const& lib, cmTargetLinkLibraryType llt)
+ std::string const& lib, cmTargetLinkLibraryType llt)
{
cmTarget* t = mf->FindLocalNonAliasTarget(target);
- if (!t)
-{
+ if (!t) {
std::ostringstream e;
-e << "Attempt to add link library \""
- << lib << "\" to target \""
- << target << "\" which is not built in this directory.";
+e << "Attempt to add link library \"" << lib << "\" to target \"" << target
+ << "\" which is not built in this directory.";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
-}
+ }
cmTarget* tgt = mf->GetGlobalGenerator()->FindTarget(lib);
- if(tgt && (tgt->GetType() != cmState::STATIC_LIBRARY) &&
- (tgt->GetType() != cmState::SHARED_LIBRARY) &&
- (tgt->GetType() != cmState::INTERFACE_LIBRARY) &&
- !tgt->IsExecutableWithExports())
-{
+ if (tgt && (tgt->GetType() != cmState::STATIC_LIBRARY) &&
+ (tgt->GetType() != cmState::SHARED_LIBRARY) &&
+ (tgt->GetType() != cmState::INTERFACE_LIBRARY) &&
+ !tgt->IsExecutableWithExports()) {
std::ostringstream e;
e << "Target \"" << lib << "\" of type "
<< cmState::GetTargetTypeName(tgt->GetType())
@@ -364,9 +361,9 @@ static void addLinkLibrary(cmMakefile* mf, std::string
const& target,
<< "One may link only to STATIC or SHARED libraries, or "
<< "to executables with the ENABLE_EXPORTS property set.";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
-}
+ }
- t->AddLinkLibrary( *mf, lib, llt );
+ t->AddLinkLibrary(*mf, lib, llt);
}
void CCONV cmAddLinkLibraryForTarget(void* arg, const char* tgt,
@@ -376,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void* arg, const
char* tgt,
switch (libtype) {
case CM_LIBRARY_GENERAL:
- addLinkLibrary(mf, tgt,value, GENERAL_LibraryType);
+ addLinkLibrary(mf, tgt, value, GENERAL_LibraryType);
break;
case CM_LIBRARY_DEBUG:
- addLinkLibrary(mf, tgt,value, DEBUG_LibraryType);
+ addLinkLibrary(mf, tgt, value, DEBUG_LibraryType);
break;
case CM_LIBRARY_OPTIMIZED:
- addLinkLibrary(mf, tgt,value, OPTIMIZED_LibraryType);
+ addLinkLibrary(mf, tgt, value, OPTIMIZED_LibraryType);
break;
}
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d443423..6ab45bb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1238,8 +1238,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
}
// link libraries
- this->SetProperty("LINK_LIBRARIES",
-parent->GetProperty("LINK_LIBRARIES"));
+ this->SetProperty("LINK_LIBRARIES", parent->GetProperty("LINK_LIBRARIES"));
// link directories
this->SetProperty("LINK_DIRECTORIES",
@@ -1804,14 +1803,11 @@ void cmMakefile::AddGlobalLinkInformation(cmTarget&
target)
j != linkLibs.end(); ++j) {
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-254-g61e6945
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 61e69451ace821aaa94a9ba2b2f4e15140222736 (commit)
via f4458e9fd0120198fab3b862f1e12552fd9d9c4b (commit)
from da3c79a376774a27792e349381ea727bc91e1eef (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=61e69451ace821aaa94a9ba2b2f4e15140222736
commit 61e69451ace821aaa94a9ba2b2f4e15140222736
Merge: da3c79a f4458e9
Author: Stephen Kelly
AuthorDate: Fri Oct 7 16:05:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 16:05:06 2016 -0400
Merge topic 'clean-up-link-configuration' into next
f4458e9f cmMakefile: Simplify programmer error to an assert
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4458e9fd0120198fab3b862f1e12552fd9d9c4b
commit f4458e9fd0120198fab3b862f1e12552fd9d9c4b
Author: Stephen Kelly
AuthorDate: Fri Oct 7 20:13:37 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 22:04:54 2016 +0200
cmMakefile: Simplify programmer error to an assert
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2414b32..d443423 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1836,14 +1836,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string&
lname,
const std::vector& srcs,
bool excludeFromAll)
{
- // wrong type ? default to STATIC
- if ((type != cmState::STATIC_LIBRARY) && (type != cmState::SHARED_LIBRARY) &&
- (type != cmState::MODULE_LIBRARY) && (type != cmState::OBJECT_LIBRARY) &&
- (type != cmState::INTERFACE_LIBRARY)) {
-this->IssueMessage(cmake::INTERNAL_ERROR,
- "cmMakefile::AddLibrary given invalid target type.");
-type = cmState::STATIC_LIBRARY;
- }
+ assert(type == cmState::STATIC_LIBRARY || type == cmState::SHARED_LIBRARY ||
+ type == cmState::MODULE_LIBRARY || type == cmState::OBJECT_LIBRARY ||
+ type == cmState::INTERFACE_LIBRARY);
cmTarget* target = this->AddNewTarget(type, lname);
// Clear its dependencies. Otherwise, dependencies might persist
---
Summary of changes:
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-252-gda3c79a
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 da3c79a376774a27792e349381ea727bc91e1eef (commit)
via d8633d344b2393a38746898963f7fdd5c997098a (commit)
from 9f667ee9f52f436a3d43121d43c8efe4e05709e1 (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=da3c79a376774a27792e349381ea727bc91e1eef
commit da3c79a376774a27792e349381ea727bc91e1eef
Merge: 9f667ee d8633d3
Author: Stephen Kelly
AuthorDate: Fri Oct 7 16:04:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 16:04:44 2016 -0400
Merge topic 'clean-up-link-configuration' into next
d8633d34 Revert "cmMakefile: Move link_libraries() related code out"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8633d344b2393a38746898963f7fdd5c997098a
commit d8633d344b2393a38746898963f7fdd5c997098a
Author: Stephen Kelly
AuthorDate: Fri Oct 7 22:04:20 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 22:04:20 2016 +0200
Revert "cmMakefile: Move link_libraries() related code out"
This reverts commit 9723f4ddb9cc0767b7b963aa31def62c11b05c50.
diff --git a/Source/cmAddExecutableCommand.cxx
b/Source/cmAddExecutableCommand.cxx
index 10b4b76..96ad82a 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -2,8 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmAddExecutableCommand.h"
-#include "cmLinkLibrariesCommand.h"
-
// cmExecutableCommand
bool cmAddExecutableCommand::InitialPass(std::vector const& args,
cmExecutionStatus&)
@@ -190,9 +188,6 @@ bool
cmAddExecutableCommand::InitialPass(std::vector const& args,
std::vector srclists(s, args.end());
cmTarget* tgt =
this->Makefile->AddExecutable(exename.c_str(), srclists, excludeFromAll);
-
- cmLinkLibrariesCommand::PopulateTarget(*tgt, this->Makefile);
-
if (use_win32) {
tgt->SetProperty("WIN32_EXECUTABLE", "ON");
}
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 8c02f75..26e38b8 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -4,7 +4,6 @@
#include "cmState.h"
#include "cmake.h"
-#include "cmLinkLibrariesCommand.h"
// cmLibraryCommand
bool cmAddLibraryCommand::InitialPass(std::vector const& args,
@@ -356,9 +355,7 @@ bool
cmAddLibraryCommand::InitialPass(std::vector const& args,
srclists.insert(srclists.end(), s, args.end());
- cmTarget* tgt = this->Makefile->AddLibrary(libName, type, srclists,
excludeFromAll);
-
- cmLinkLibrariesCommand::PopulateTarget(*tgt, this->Makefile);
+ this->Makefile->AddLibrary(libName, type, srclists, excludeFromAll);
return true;
}
diff --git a/Source/cmLinkLibrariesCommand.cxx
b/Source/cmLinkLibrariesCommand.cxx
index ecf3f57..4202cf5 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -35,57 +35,3 @@ bool
cmLinkLibrariesCommand::InitialPass(std::vector const& args,
return true;
}
-
-void cmLinkLibrariesCommand::PopulateTarget(cmTarget& target, cmMakefile* mf)
-{
- // for these targets do not add anything
- switch (target.GetType()) {
-case cmState::UTILITY:
-case cmState::GLOBAL_TARGET:
-case cmState::INTERFACE_LIBRARY:
- return;
-default:;
- }
- if (const char* linkDirsProp = mf->GetProperty("LINK_DIRECTORIES")) {
-std::vector linkDirs;
-cmSystemTools::ExpandListArgument(linkDirsProp, linkDirs);
-
-for (std::vector::iterator j = linkDirs.begin();
- j != linkDirs.end(); ++j) {
- std::string newdir = *j;
- // remove trailing slashes
- if (*j->rbegin() == '/') {
-newdir = j->substr(0, j->size() - 1);
- }
- target.AddLinkDirectory(*j);
-}
- }
-
- if (const char* linkLibsProp = mf->GetProperty("LINK_LIBRARIES")) {
-std::vector linkLibs;
-cmSystemTools::ExpandListArgument(linkLibsProp, linkLibs);
-
-for (std::vector::iterator j = linkLibs.begin();
- j != linkLibs.end(); ++j) {
- std::string libraryName = *j;
- cmTargetLinkLibraryType libType = GENERAL_LibraryType;
- if (libraryName == "optimized")
- {
-libType = OPTIMIZED_LibraryType;
-++j;
-libraryName = *j;
- } else
- if (libraryName == "debug")
- {
-libType = DEBUG_LibraryType;
-++j;
-
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-250-g9f667ee
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 9f667ee9f52f436a3d43121d43c8efe4e05709e1 (commit)
via 87bde938fe3c66fc6298108c7594578005bbb2a6 (commit)
via 9723f4ddb9cc0767b7b963aa31def62c11b05c50 (commit)
via cd04ce0a7f6317169f6d8738f56b46c658314bd0 (commit)
via d89821cdd61896d7500f8ca2378294d9cf7aa27e (commit)
via 7edfcd0e834a4dc8d3da9cada6ad6b9b46dfb4dd (commit)
via 6c8dc7f1df6d3492d11ad994a35ee2f0b8a4e60b (commit)
via 1efca9f427a5c537afc034aadf0c29073bfdfa22 (commit)
via d9b5f0a301c23c2c0e56ad3fcb696de71c3d6365 (commit)
via 1c70c6cc09f0f8be087db2aeae5ee6a3f1b47bda (commit)
via 2b7baed719e4a6eb918ed6f22ee6031a40b7f316 (commit)
via 7ba954925a876f4c753a4296236bc7d2f18eb0b8 (commit)
via 6d98b15fc8b9a065325e3683afe94efce17dd162 (commit)
via 869037ee86d1c0ab757840adf499ea270d4301e1 (commit)
via 2f6462a634726d9d0ea8d8552454839d67183016 (commit)
via 148b83a12185d7611ff7576464087430c3f2719c (commit)
via 4457a9f181663701961dc209740974f48213e6e7 (commit)
via 4d039c5b46e3cac29ff1d9ce3e768af1bca6b69a (commit)
via c8ec8d6a7ec6c176bc14e7026dc755a9be8689cb (commit)
via 3e8d47d18b4db6b4621ee5e4864dde234ad8a282 (commit)
via 3b4895fa35e4a96022abd99b07002a7d2ab3a968 (commit)
via 2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f (commit)
via 9a1d4e4ba170f4ac34c80593bd2fe8e1481a1181 (commit)
via 8391b3015a82909828b7ada98e76d45aa11b892b (commit)
from befbf7ad51059b6077de1fa34a59bde28284731a (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=9f667ee9f52f436a3d43121d43c8efe4e05709e1
commit 9f667ee9f52f436a3d43121d43c8efe4e05709e1
Merge: befbf7a 87bde93
Author: Stephen Kelly
AuthorDate: Fri Oct 7 15:49:21 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 15:49:21 2016 -0400
Merge topic 'clean-up-link-configuration' into next
87bde938 cmMakefile: Simplify programmer error to an assert
9723f4dd cmMakefile: Move link_libraries() related code out
cd04ce0a cmMakefile: Implement LinkLibraries as an internal property
d89821cd cmMakefile: Inline method into only remaining caller
7edfcd0e cmMakefile: Inline method into caller
6c8dc7f1 cmake: Simplify find-package mode library addition
1efca9f4 cmMakefile: Remove obsolete parameter
d9b5f0a3 cmTarget: Remove target name from parameter list
1c70c6cc cmMakefile: Use public API to find a target
2b7baed7 cmMakefile: Inline method into only caller
7ba95492 cmMakefile: Use public API to find a target
6d98b15f cmMakefile: Invert if() condition to remove else
869037ee cmMakefile: Remove ALIAS check
2f6462a6 cmMakefile: Collapse two consecutive if()s into one
148b83a1 cmMakefile: DeMorgan-invert condition
4457a9f1 cmMakefile: Return after error and remove else condition
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87bde938fe3c66fc6298108c7594578005bbb2a6
commit 87bde938fe3c66fc6298108c7594578005bbb2a6
Author: Stephen Kelly
AuthorDate: Fri Oct 7 20:13:37 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 21:33:25 2016 +0200
cmMakefile: Simplify programmer error to an assert
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 12f971f..c4d6103 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1782,14 +1782,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string&
lname,
const std::vector& srcs,
bool excludeFromAll)
{
- // wrong type ? default to STATIC
- if ((type != cmState::STATIC_LIBRARY) && (type != cmState::SHARED_LIBRARY) &&
- (type != cmState::MODULE_LIBRARY) && (type != cmState::OBJECT_LIBRARY) &&
- (type != cmState::INTERFACE_LIBRARY)) {
-this->IssueMessage(cmake::INTERNAL_ERROR,
- "cmMakefile::AddLibrary given invalid target type.");
-type = cmState::STATIC_LIBRARY;
- }
+ assert(type == cmState::STATIC_LIBRARY || type == cmState::SHARED_LIBRARY ||
+ type == cmState::MODULE_LIBRARY || type == cmState::OBJECT_LIBRARY ||
+ type == cmState::INTERFACE_LIBRARY);
cmTarget* target = this->AddNewTarget(type, lname);
// Clear its dependencies. Otherwise, dependencies might persist
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9723f4ddb9cc0767b7b963aa31def62c11b05c50
commit 9723f4ddb9cc0767b7b963aa31def62c11b05c50
Author: Stephen Kelly
AuthorDate: Fri O
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-226-gbefbf7a
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 befbf7ad51059b6077de1fa34a59bde28284731a (commit)
via cb56b773baeb123f22a8d4409c1a68bce0d3e45c (commit)
via 409a2a800115fb55aadf78e23deb85a57b8ffcbe (commit)
via 0a291271fdbd530a38722bc554e7bbb49cc7245d (commit)
via 4eb2c4dcaf55ea08c633871fc54dba411803832d (commit)
via c12a24cefaebc06d825578270473bf4537568ffb (commit)
via cf39fd0f40c77a3a05fd921e66ee814a572e4086 (commit)
via d9fde87d1a3a4de382d664bd121af957af6eaaea (commit)
via d92c160db333bf65e52da1cb73a068b5d3f1db4f (commit)
from 4b64d265ee79a39aabe6241f3e0811f38c0c2177 (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=befbf7ad51059b6077de1fa34a59bde28284731a
commit befbf7ad51059b6077de1fa34a59bde28284731a
Merge: 4b64d26 cb56b77
Author: Stephen Kelly
AuthorDate: Fri Oct 7 15:48:13 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 7 15:48:13 2016 -0400
Merge topic 'ninja-cleanups' into next
cb56b773 Ninja: Extract a static path conversion method
409a2a80 Ninja: Inline conversion to relative path
0a291271 Ninja: Get the binary directory from cmState::Directory
4eb2c4dc Ninja: Inline output path conversion
c12a24ce Ninja: Simplify method
cf39fd0f Ninja: Extract identical code from condition
d9fde87d Ninja: Replace array access with local variable
d92c160d Ninja: Separate two coupled calls
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb56b773baeb123f22a8d4409c1a68bce0d3e45c
commit cb56b773baeb123f22a8d4409c1a68bce0d3e45c
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:33 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 21:37:38 2016 +0200
Ninja: Extract a static path conversion method
It is independent of cmLocalGenerator.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 9a7939e..1b4e34c 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -835,8 +835,14 @@ std::string
cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
cmLocalNinjaGenerator* ng =
static_cast(this->LocalGenerators[0]);
- cmState::Directory stateDir = ng->GetStateSnapshot().GetDirectory();
+ return ConvertToNinjaPath(path, ng->GetStateSnapshot().GetDirectory(),
+this->OutputPathPrefix);
+}
+std::string cmGlobalNinjaGenerator::ConvertToNinjaPath(
+ const std::string& path, cmState::Directory stateDir,
+ std::string const& prefix)
+{
std::string convPath = path;
if (cmOutputConverter::ContainedInDirectory(stateDir.GetCurrentBinary(),
@@ -846,7 +852,7 @@ std::string
cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
}
if (!cmSystemTools::FileIsFullPath(convPath)) {
-convPath = this->OutputPathPrefix + convPath;
+convPath = prefix + convPath;
}
#ifdef _WIN32
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index dcf7406..51a8032 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -233,6 +233,9 @@ public:
return this->RulesFileStream;
}
+ static std::string ConvertToNinjaPath(const std::string& path,
+cmState::Directory stateDir,
+std::string const& prefix);
std::string ConvertToNinjaPath(const std::string& path);
std::string ConvertToNinjaFolderRule(const std::string& path);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=409a2a800115fb55aadf78e23deb85a57b8ffcbe
commit 409a2a800115fb55aadf78e23deb85a57b8ffcbe
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:33 2016 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 7 21:37:38 2016 +0200
Ninja: Inline conversion to relative path
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 5bec420..9a7939e 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -837,8 +837,13 @@ std::string
cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
cmState::Directory stateDir = ng->GetStateSnapshot().GetDirectory();
- std::string convPath =
-ng->ConvertToRelativePath(stateDir.GetCurrentBinary(), path);
+ std::string convPath = path;
+
+ if (cmOutputConverter::ContainedInDirectory(stateDir.GetCurrentBinary(),
+ path, stateDir)) {
+convPath = cmOutputConvert
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-164-gaf6f300
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 af6f3004dcf83123b3d12cf7446edb51bbec1b14 (commit)
via 2c7bc60834cde0c0e5eff03db092c341dfac78b7 (commit)
from ab65a1e18599219c644889c4d4cb1b45c0dc8383 (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=af6f3004dcf83123b3d12cf7446edb51bbec1b14
commit af6f3004dcf83123b3d12cf7446edb51bbec1b14
Merge: ab65a1e 2c7bc60
Author: Stephen Kelly
AuthorDate: Thu Oct 6 16:44:59 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 16:44:59 2016 -0400
Merge topic 'CMP0065-LINK_FLAGS' into next
2c7bc608 fixup! CMP0065: Put computed flags into LINK_FLAGS not
LINK_LIBRARIES
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c7bc60834cde0c0e5eff03db092c341dfac78b7
commit 2c7bc60834cde0c0e5eff03db092c341dfac78b7
Author: Stephen Kelly
AuthorDate: Thu Oct 6 22:44:41 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 22:44:41 2016 +0200
fixup! CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a0ff824..3fabd53 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1438,6 +1438,8 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::string linkLanguage = cli.GetLinkLanguage();
+ std::string linkLibs;
+
std::string libPathFlag =
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
std::string libPathTerminator =
---
Summary of changes:
Source/cmLocalGenerator.cxx |2 ++
1 file changed, 2 insertions(+)
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-162-gab65a1e
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 ab65a1e18599219c644889c4d4cb1b45c0dc8383 (commit)
via d96271d9e14354ffb93f80a5ba85fb337767a6c5 (commit)
via 7f1cd3280cf484b5d565a12ae57022de018faa57 (commit)
via 2597bcf831dae6a0a7a212607ea4b926ec6b10e0 (commit)
from f90c7ba54f1a9a61e930292207d3387df40b2dad (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=ab65a1e18599219c644889c4d4cb1b45c0dc8383
commit ab65a1e18599219c644889c4d4cb1b45c0dc8383
Merge: f90c7ba d96271d
Author: Stephen Kelly
AuthorDate: Thu Oct 6 16:35:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 16:35:44 2016 -0400
Merge topic 'CMP0065-LINK_FLAGS' into next
d96271d9 CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
7f1cd328 cmLocalGenerator: Rename local variable to be more appropriate
2597bcf8 cmLocalGenerator: Extract policy handling into a method
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d96271d9e14354ffb93f80a5ba85fb337767a6c5
commit d96271d9e14354ffb93f80a5ba85fb337767a6c5
Author: Stephen Kelly
AuthorDate: Thu Oct 6 22:25:44 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 22:33:01 2016 +0200
CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
These flags are redundant anyway in the NEW case of the policy, and
could be merged with CMAKE_EXE_EXPORTS_${lang}_FLAG content for that
case. That is deferred to the future, but now at least the similar code
is located close to each other.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a0f6423..a0ff824 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1248,6 +1248,14 @@ void cmLocalGenerator::GetTargetFlags(
linkFlags += this->Makefile->GetSafeDefinition(exportFlagVar);
linkFlags += " ";
}
+
+ std::string cmp0065Flags =
+this->GetLinkLibsCMP0065(linkLanguage, *target);
+ if (!cmp0065Flags.empty()) {
+linkFlags += cmp0065Flags;
+linkFlags += " ";
+ }
+
const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
if (targetLinkFlags) {
linkFlags += targetLinkFlags;
@@ -1430,8 +1438,6 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::string linkLanguage = cli.GetLinkLanguage();
- std::string linkLibs = this->GetLinkLibsCMP0065(linkLanguage, tgt);
-
std::string libPathFlag =
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
std::string libPathTerminator =
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx
b/Source/cmMakefileExecutableTargetGenerator.cxx
index cb20117..42e12ad 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -192,6 +192,11 @@ void
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
this->LocalGenerator->AppendFlags(
linkFlags, this->Makefile->GetDefinition(export_flag_var));
}
+
+ this->LocalGenerator->AppendFlags(linkFlags,
+this->LocalGenerator->GetLinkLibsCMP0065(
+ linkLanguage, *this->GeneratorTarget));
+
if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
this->LocalGenerator->AppendFlags(linkFlags, " -Wl,--no-as-needed");
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f1cd3280cf484b5d565a12ae57022de018faa57
commit 7f1cd3280cf484b5d565a12ae57022de018faa57
Author: Stephen Kelly
AuthorDate: Thu Oct 6 22:25:05 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 22:25:05 2016 +0200
cmLocalGenerator: Rename local variable to be more appropriate
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6cc03e8..a0f6423 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1531,7 +1531,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::string cmLocalGenerator::GetLinkLibsCMP0065(
std::string const& linkLanguage, cmGeneratorTarget& tgt) const
{
- std::string linkLibs;
+ std::string linkFlags;
// Flags to link an executable to shared libraries.
if (tgt.GetType() == cmState::EXECUTABLE &&
@@ -1571,11 +1571,10 @@ std::string cmLocalGenerator::GetLinkLibsCMP0065(
std::string linkFlagsVar = "CMAKE_SHARED_LIBRARY_LINK_";
lin
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-155-gc8a4533
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 c8a45332313cac5acc6661f8bcf4993d1fb81b49 (commit)
via 20e62f74c5a030a25fe1c3a6c835d67eea152d8f (commit)
via fd93b3605bc931b5ce2386816973e106fa1ec646 (commit)
via 1365e18b9b5ddfb5bc13da5bcdefeb566be12f08 (commit)
via 1ed5f6b39b80ab337551f1fa9601b3257ddd4be7 (commit)
via 8377d9e00b7a00f1687b947aaf3c9e10b6779df4 (commit)
via 00173b71d97f81cc9db9b573998bd4359aa2c25b (commit)
via d5911ef014fcffd14d397759ca638519733a48ad (commit)
via c3264f48c2960325b9141d3ec58c6b49afe120c9 (commit)
via 52168f3210ca07a8d80991958d588789c2693d63 (commit)
via 5213f8936fd5a70e1f38939e5d1894e7fabb9e02 (commit)
via b61c268bd04425597e2e9c5f213dea3cdad3cb19 (commit)
via e278f5a84806a2b228182dc4a2cc98a1eaa19f8c (commit)
from 78a3604d252b6f42d192807b9bac84f46e6ec76f (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=c8a45332313cac5acc6661f8bcf4993d1fb81b49
commit c8a45332313cac5acc6661f8bcf4993d1fb81b49
Merge: 78a3604 20e62f7
Author: Stephen Kelly
AuthorDate: Thu Oct 6 15:00:27 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 15:00:27 2016 -0400
Merge topic 'cleanup-Convert' into next
20e62f74 cmLocalGenerator: Simplify ConvertToLinkReference
fd93b360 cmOutputConverter: Add a flag for IsUnix
1365e18b Convert: Inline platform-specific methods
1ed5f6b3 Makefiles: Introduce local RelativePath method
8377d9e0 Fortran: Inline conversion to relative path
00173b71 Fortran: Wrap path convert in a call with a more-suitable name
d5911ef0 Makefiles: Hardcode the relative location of the CMakeCache file
c3264f48 Convert: Extract method to determine if paths are in directory
52168f32 Convert: Remove asserts which are duplicated in delegate method
5213f893 Convert: Remove early return check
b61c268b Convert: Extract local variables for readability
e278f5a8 Convert: Extract local variables
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e62f74c5a030a25fe1c3a6c835d67eea152d8f
commit 20e62f74c5a030a25fe1c3a6c835d67eea152d8f
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:32 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 20:02:10 2016 +0200
cmLocalGenerator: Simplify ConvertToLinkReference
Make conversion to output format the caller responsibility, so that the
method only 'converts to a link reference'.
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index 6887a31..14ea1a9 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -75,8 +75,10 @@ void
cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags)
// Append the flag and value. Use ConvertToLinkReference to help
// vs6's "cl -link" pass it to the linker.
std::string flag = defFileFlag;
- flag += (this->LocalGenerator->ConvertToLinkReference(
-this->ModuleDefinitionFile->GetFullPath()));
+ flag += this->LocalGenerator->ConvertToOutputFormat(
+this->LocalGenerator->ConvertToLinkReference(
+ this->ModuleDefinitionFile->GetFullPath()),
+cmOutputConverter::SHELL);
this->LocalGenerator->AppendFlags(flags, flag);
}
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f24b717..b2569a2 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1374,8 +1374,7 @@ std::string cmLocalGenerator::GetTargetFortranFlags(
return std::string();
}
-std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib,
- OutputFormat format)
+std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
// Work-ardound command line parsing limitations in MSVC 6.0
@@ -1392,17 +1391,14 @@ std::string
cmLocalGenerator::ConvertToLinkReference(std::string const& lib,
// Append the rest of the path with no space.
sp += lib.substr(pos);
-// Convert to an output path.
-return this->ConvertToOutputFormat(sp.c_str(), format);
+return sp;
}
}
}
#endif
// Normal behavior.
- return this->ConvertToOutputFormat(
-this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), lib),
-format);
+ return this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), lib);
}
/**
@@
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-142-g78a3604
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 78a3604d252b6f42d192807b9bac84f46e6ec76f (commit)
via d9718500fa01d3045ca86e85be68ab9dfee4cbed (commit)
from 0d83b5464de903900cbe02e9bc484c30b37bca2b (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=78a3604d252b6f42d192807b9bac84f46e6ec76f
commit 78a3604d252b6f42d192807b9bac84f46e6ec76f
Merge: 0d83b54 d971850
Author: Stephen Kelly
AuthorDate: Thu Oct 6 14:01:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 14:01:44 2016 -0400
Merge topic 'cleanup-Convert' into next
d9718500 Revert "cmOutputConverter: Remove Convert..ForExisting method
(#16138)"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9718500fa01d3045ca86e85be68ab9dfee4cbed
commit d9718500fa01d3045ca86e85be68ab9dfee4cbed
Author: Stephen Kelly
AuthorDate: Thu Oct 6 20:00:51 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 20:00:51 2016 +0200
Revert "cmOutputConverter: Remove Convert..ForExisting method (#16138)"
This reverts commit 0fb47ff836af7fbd74998bfeb3067708b9f7db68.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8fcfb32..b2569a2 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -731,8 +731,7 @@ std::string cmLocalGenerator::ExpandRuleVariable(
std::string replace = this->Makefile->GetSafeDefinition(variable);
// if the variable is not a FLAG then treat it like a path
if (variable.find("_FLAG") == variable.npos) {
- std::string ret =
-this->ConvertToOutputFormat(replace, cmOutputConverter::SHELL);
+ std::string ret = this->ConvertToOutputForExisting(replace);
// if there is a required first argument to the compiler add it
// to the compiler string
if (compilerArg1) {
@@ -829,7 +828,7 @@ std::string cmLocalGenerator::ConvertToIncludeReference(
std::string const& path, OutputFormat format, bool forceFullPaths)
{
static_cast(forceFullPaths);
- return this->ConvertToOutputFormat(path, format);
+ return this->ConvertToOutputForExisting(path, format);
}
std::string cmLocalGenerator::GetIncludeFlags(
@@ -1497,7 +1496,8 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::vector const& libDirs = cli.GetDirectories();
for (std::vector::const_iterator libDir = libDirs.begin();
libDir != libDirs.end(); ++libDir) {
-std::string libpath = this->ConvertToOutputFormat(*libDir, shellFormat);
+std::string libpath =
+ this->ConvertToOutputForExisting(*libDir, shellFormat);
linkPath += " " + libPathFlag;
linkPath += libpath;
linkPath += libPathTerminator;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 401319e..915119c 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2081,19 +2081,18 @@ void cmLocalUnixMakefileGenerator3::CreateCDCommand(
// back because the shell keeps the working directory between
// commands.
std::string cmd = cd_cmd;
-cmd += this->ConvertToOutputFormat(tgtDir, cmOutputConverter::SHELL);
+cmd += this->ConvertToOutputForExisting(tgtDir);
commands.insert(commands.begin(), cmd);
// Change back to the starting directory.
cmd = cd_cmd;
-cmd += this->ConvertToOutputFormat(relDir, cmOutputConverter::SHELL);
+cmd += this->ConvertToOutputForExisting(relDir);
commands.push_back(cmd);
} else {
// On UNIX we must construct a single shell command to change
// directory and build because make resets the directory between
// each command.
-std::string outputForExisting =
- this->ConvertToOutputFormat(tgtDir, cmOutputConverter::SHELL);
+std::string outputForExisting = this->ConvertToOutputForExisting(tgtDir);
std::string prefix = cd_cmd + outputForExisting + " && ";
std::transform(commands.begin(), commands.end(), commands.begin(),
std::bind1st(std::plus(), prefix));
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 05e7d63..84a433c 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -18,6 +18,25 @@ cmOutputConverter::cmOutputConverter(cmState::Snapshot
snapshot)
assert(this->StateSnapshot.IsValid());
}
+std::string cmOutputConverter::ConvertToOutputForExisting(
+ const std::st
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-131-g23d732f
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 23d732fa83e7e0ae07aad810e1867238900a51f0 (commit)
via 8f612e2aa4496e3ef88ee80c2ed33e7ba4d6ea64 (commit)
via f6a0ca3e63547e728d2eea19803d24ed9825d467 (commit)
via d27726cf694036fe22622ce93736a9d0f9896fd6 (commit)
via 1a973ccfd069fb9300d2a6078cf8cf3f25c3b5a2 (commit)
via 6334f0e256eb8c89660f41ac9eee68035b78902d (commit)
via a2683d3cccd196764d24f9cd6eab4ab64f239819 (commit)
via ac67d12cef8f91be025c9b5491d79419970c4684 (commit)
via 859b341859ac13aa8e872101240fc8c47c766e23 (commit)
via f9bde4d2941bf65df78d22dbb713f6f79a7133fa (commit)
via 0e81268978550f0573845b7e626e47de85d67279 (commit)
via 4dfbdc908600a3fc98de34b765ba255646b6e648 (commit)
via 88be3514f5d7a1187880bb89481954b6da26ebb6 (commit)
via 0fb47ff836af7fbd74998bfeb3067708b9f7db68 (commit)
via 51bc6bddb91283da25d098492c9cc1b50e3008fc (commit)
via 8e0c1599a1015cf80c4db35d108509986236b756 (commit)
from eea5dbab2e1db3b265035346d52a2b2c6df53a5c (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=23d732fa83e7e0ae07aad810e1867238900a51f0
commit 23d732fa83e7e0ae07aad810e1867238900a51f0
Merge: eea5dba 8f612e2
Author: Stephen Kelly
AuthorDate: Thu Oct 6 12:45:43 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 12:45:43 2016 -0400
Merge topic 'cleanup-Convert' into next
8f612e2a cmLocalGenerator: Simplify ConvertToLinkReference
f6a0ca3e cmOutputConverter: Add a flag for IsUnix
d27726cf Convert: Inline platform-specific methods
1a973ccf Makefiles: Introduce local RelativePath method
6334f0e2 Fortran: Inline conversion to relative path
a2683d3c Fortran: Wrap path convert in a call with a more-suitable name
ac67d12c Makefiles: Hardcode the relative location of the CMakeCache file
859b3418 Convert: Extract method to determine if paths are in directory
f9bde4d2 Convert: Remove asserts which are duplicated in delegate method
0e812689 Convert: Remove early return check
4dfbdc90 Convert: Extract local variables for readability
88be3514 Convert: Extract local variables
0fb47ff8 cmOutputConverter: Remove Convert..ForExisting method (#16138)
51bc6bdd cmOutputConverter: remove unused code
8e0c1599 Xcode: Inline ConvertToRelativePath calls
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f612e2aa4496e3ef88ee80c2ed33e7ba4d6ea64
commit 8f612e2aa4496e3ef88ee80c2ed33e7ba4d6ea64
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:32 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 18:45:18 2016 +0200
cmLocalGenerator: Simplify ConvertToLinkReference
Make conversion to output format the caller responsibility, so that the
method only 'converts to a link reference'.
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index 6887a31..14ea1a9 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -75,8 +75,10 @@ void
cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags)
// Append the flag and value. Use ConvertToLinkReference to help
// vs6's "cl -link" pass it to the linker.
std::string flag = defFileFlag;
- flag += (this->LocalGenerator->ConvertToLinkReference(
-this->ModuleDefinitionFile->GetFullPath()));
+ flag += this->LocalGenerator->ConvertToOutputFormat(
+this->LocalGenerator->ConvertToLinkReference(
+ this->ModuleDefinitionFile->GetFullPath()),
+cmOutputConverter::SHELL);
this->LocalGenerator->AppendFlags(flags, flag);
}
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1f9e4cf..8fcfb32 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1375,8 +1375,7 @@ std::string cmLocalGenerator::GetTargetFortranFlags(
return std::string();
}
-std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib,
- OutputFormat format)
+std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
// Work-ardound command line parsing limitations in MSVC 6.0
@@ -1393,17 +1392,14 @@ std::string
cmLocalGenerator::ConvertToLinkReference(std::string const& lib,
// Append the rest of the path with no space.
sp += lib.substr(pos);
-// Convert to an output path.
-
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-115-geea5dba
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 eea5dbab2e1db3b265035346d52a2b2c6df53a5c (commit) via f5c9da0999ca2edfa337796a1e2da9726198c9bf (commit) from f38d2ed7d391c788baec7e215ee0c1b1d95982d1 (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=eea5dbab2e1db3b265035346d52a2b2c6df53a5c commit eea5dbab2e1db3b265035346d52a2b2c6df53a5c Merge: f38d2ed f5c9da0 Author: Stephen Kelly AuthorDate: Thu Oct 6 12:43:32 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 6 12:43:32 2016 -0400 Merge topic 'codelite-global-setting' into next f5c9da09 fixup! Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5c9da0999ca2edfa337796a1e2da9726198c9bf commit f5c9da0999ca2edfa337796a1e2da9726198c9bf Author: Stephen Kelly AuthorDate: Thu Oct 6 18:42:59 2016 +0200 Commit: Stephen Kelly CommitDate: Thu Oct 6 18:42:59 2016 +0200 fixup! Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally diff --git a/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst index 4aede03..96d678f 100644 --- a/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst +++ b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst @@ -3,5 +3,5 @@ CMAKE_CODELITE_USE_TARGETS Change the way the CodeLite generator creates projectfiles. -If this variable is set to ``ON`` the generator creates projectfiles -based on targets rather than projects. +If this variable is set to ``ON`` in the top-level CMakeLists file, +the generator creates projectfiles based on targets rather than projects. --- Summary of changes: Help/variable/CMAKE_CODELITE_USE_TARGETS.rst |4 ++-- 1 file 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-113-gf38d2ed
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 f38d2ed7d391c788baec7e215ee0c1b1d95982d1 (commit)
via c8c24d8dd52fd3e79f6019f605161024d35082b8 (commit)
via f59e87792943904dcb11e16380883e87395d115f (commit)
from 6a0843d3b684ff3dd57f9e29aaf9947dcc81c253 (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=f38d2ed7d391c788baec7e215ee0c1b1d95982d1
commit f38d2ed7d391c788baec7e215ee0c1b1d95982d1
Merge: 6a0843d c8c24d8d
Author: Stephen Kelly
AuthorDate: Thu Oct 6 12:42:08 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 6 12:42:08 2016 -0400
Merge topic 'codelite-global-setting' into next
c8c24d8d Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally
f59e8779 cmGlobalGenerator: Add API to get settings from top-level
cmMakefile
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c24d8dd52fd3e79f6019f605161024d35082b8
commit c8c24d8dd52fd3e79f6019f605161024d35082b8
Author: Stephen Kelly
AuthorDate: Thu Oct 6 18:35:02 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 18:41:07 2016 +0200
Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally
diff --git a/Source/cmExtraCodeLiteGenerator.cxx
b/Source/cmExtraCodeLiteGenerator.cxx
index 629c5b6..360c852 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -60,7 +60,6 @@ void cmExtraCodeLiteGenerator::Generate()
// loop projects and locate the root project.
// and extract the information for creating the worspace
// root makefile
- const cmMakefile* rmf = CM_NULLPTR;
for (std::map >::const_iterator
it = projectMap.begin();
it != projectMap.end(); ++it) {
@@ -75,7 +74,6 @@ void cmExtraCodeLiteGenerator::Generate()
workspaceFileName = workspaceOutputDir + "/";
workspaceFileName += workspaceProjectName + ".workspace";
this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();
- rmf = it->second[0]->GetMakefile();
;
break;
}
@@ -89,7 +87,7 @@ void cmExtraCodeLiteGenerator::Generate()
xml.Attribute("Name", workspaceProjectName);
bool const targetsAreProjects =
-rmf && rmf->IsOn("CMAKE_CODELITE_USE_TARGETS");
+this->GlobalGenerator->GlobalSettingIsOn("CMAKE_CODELITE_USE_TARGETS");
std::vector ProjectNames;
if (targetsAreProjects) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59e87792943904dcb11e16380883e87395d115f
commit f59e87792943904dcb11e16380883e87395d115f
Author: Stephen Kelly
AuthorDate: Thu Oct 6 18:01:36 2016 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 6 18:41:06 2016 +0200
cmGlobalGenerator: Add API to get settings from top-level cmMakefile
At generate-time, definitions are sometimes read from a nearby cmMakefile,
making the value directory-specific because they are read once per
directory. Often however, the intention is more
often to create a 'global' setting, such that the user writes for
example:
set(CMAKE_IMPORT_LIBRARY_SUFFIX something)
once at the top level of their project.
Many of these are also set by internal platform files, such as
CMAKE_EXTRA_LINK_EXTENSIONS.
The set() definitions are not really suitable for 'global' settings
because they can be different for each directory, and code consuming the
settings must assume they are different for each directory, and read it
freshly each time with new allocations.
CMake has other variable types which are global in scope, such as global
properties, and cache variables. These are less convenient to populate
for users, so establish a convention and API using the value as it is at
the end of the top-level CMakeLists file.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a446862..7132ade 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1007,6 +1007,25 @@ void cmGlobalGenerator::FillExtensionToLanguageMap(const
std::string& l,
}
}
+const char* cmGlobalGenerator::GetGlobalSetting(std::string const& name) const
+{
+ assert(!this->Makefiles.empty());
+ return this->Makefiles[0]->GetDefinition(name);
+}
+
+bool cmGlobalGenerator::GlobalSettingIsOn(std::string const& name) const
+{
+ assert(!this->Makefiles.empty());
+ return this->Makefiles[0]->IsOn(name);
+}
+
+const char* cmGlobalGenerator::GetSafeGlobalSetting(
+
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-67-g280cf7a
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 280cf7aa4e2cad24440039f4b7105c5096caf437 (commit)
via 62e83877c58a9e81d68a30553f54f18a3ed8eb0b (commit)
from fae02d5e5126fba375e26ec66f216a1d16f29413 (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=280cf7aa4e2cad24440039f4b7105c5096caf437
commit 280cf7aa4e2cad24440039f4b7105c5096caf437
Merge: fae02d5 62e8387
Author: Stephen Kelly
AuthorDate: Tue Oct 4 18:00:00 2016 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 4 18:00:00 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
62e83877 fixup! cmLinkLineComputer: Extract from cmLocalGenerator
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62e83877c58a9e81d68a30553f54f18a3ed8eb0b
commit 62e83877c58a9e81d68a30553f54f18a3ed8eb0b
Author: Stephen Kelly
AuthorDate: Tue Oct 4 23:59:44 2016 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 4 23:59:44 2016 +0200
fixup! cmLinkLineComputer: Extract from cmLocalGenerator
diff --git a/Source/cmMSVC60LinkLineComputer.cxx
b/Source/cmMSVC60LinkLineComputer.cxx
index fbd8022..89432ff 100644
--- a/Source/cmMSVC60LinkLineComputer.cxx
+++ b/Source/cmMSVC60LinkLineComputer.cxx
@@ -3,6 +3,8 @@
#include "cmMSVC60LinkLineComputer.h"
+#include "cmSystemTools.h"
+
cmMSVC60LinkLineComputer::cmMSVC60LinkLineComputer(cmState::Directory stateDir)
: cmLinkLineComputer(stateDir)
{
---
Summary of changes:
Source/cmMSVC60LinkLineComputer.cxx |2 ++
1 file changed, 2 insertions(+)
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-65-gfae02d5
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 fae02d5e5126fba375e26ec66f216a1d16f29413 (commit)
via 866e4d53ea3a1084e8ba1dd672af83ff3d62c697 (commit)
from 74adf4e543d506a44500d0aa9bf1203c2270b217 (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=fae02d5e5126fba375e26ec66f216a1d16f29413
commit fae02d5e5126fba375e26ec66f216a1d16f29413
Merge: 74adf4e 866e4d5
Author: Stephen Kelly
AuthorDate: Tue Oct 4 17:10:02 2016 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 4 17:10:02 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
866e4d53 fixup! cmLinkLineComputer: Extract from cmLocalGenerator
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=866e4d53ea3a1084e8ba1dd672af83ff3d62c697
commit 866e4d53ea3a1084e8ba1dd672af83ff3d62c697
Author: Stephen Kelly
AuthorDate: Tue Oct 4 23:08:51 2016 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 4 23:09:30 2016 +0200
fixup! cmLinkLineComputer: Extract from cmLocalGenerator
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx
b/Source/cmMakefileExecutableTargetGenerator.cxx
index 8bc7ddf..9ee3933 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -212,16 +212,9 @@ void
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
{
-CM_AUTO_PTR linkLineComputer;
-
-if (this->Makefile->IsOn("MSVC60")) {
- linkLineComputer.reset(
-this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
-} else {
- linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+CM_AUTO_PTR linkLineComputer(
+ this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
-}
this->AddModuleDefinitionFlag(linkLineComputer.get(), linkFlags);
}
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx
b/Source/cmMakefileLibraryTargetGenerator.cxx
index f6f4a00..b12e779 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -8,7 +8,6 @@
#include "cmLinkLineComputer.h"
#include "cmLocalGenerator.h"
#include "cmLocalUnixMakefileGenerator3.h"
-#include "cmMSVC60LinkLineComputer.h"
#include "cmMakefile.h"
#include "cmOSXBundleGenerator.h"
#include "cmOutputConverter.h"
@@ -162,15 +161,9 @@ void
cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
this->LocalGenerator->AddConfigVariableFlags(
extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
- CM_AUTO_PTR linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
-linkLineComputer.reset(this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
-linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+ CM_AUTO_PTR linkLineComputer(
+this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->AddModuleDefinitionFlag(linkLineComputer.get(), extraFlags);
@@ -198,15 +191,9 @@ void
cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
this->LocalGenerator->AddConfigVariableFlags(
extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
- CM_AUTO_PTR linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
-linkLineComputer.reset(this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
-linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+ CM_AUTO_PTR linkLineComputer(
+this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->AddModuleDefinitionFlag(linkLineComputer.get(), extraFlags);
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index d6c496f..95f883e 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1580,6 +1580,15 @@ std::string
cmMakefileTargetGenerator::CreateResponseFile(
return responseFileName;
}
+cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkL
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-63-g74adf4e
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 74adf4e543d506a44500d0aa9bf1203c2270b217 (commit)
via dfa27f07b492d1aaa94b32a11b4e24ca73d5e420 (commit)
via 511ed264e1b2816d519fb45bd1a86f650d35dbed (commit)
via 6e77e10712d852322e28a9283e7b1385fed01da0 (commit)
via e5f9caf1260a17aea799487aa7abb2950d3252ce (commit)
via abb1e1d227f3f5e61fa22c57c7f6f0fdca745ace (commit)
via ee661eb0e937bbb683f1deb24faf927add5f060a (commit)
via ec5115eab84226573a8d6903db68d432c1fe147a (commit)
via 44aa69e750a730fde6610acecfef09663d42098f (commit)
via 4bd19454ed652c54d278546992f9c3606e1de966 (commit)
via 8081600219bc8638dd8ce99e6d25a7f35c0cc8f0 (commit)
via fb932b367e1678c3d4395d7af422fa9627666f1a (commit)
via 608e6fe5f24bc6cbf8f4296994fa3878b49a4557 (commit)
via 5dcf248bc167a04886fb5388c42d1d11aae61cec (commit)
via 3288481c22337a8bdd785d0cd8b725d5abc1351d (commit)
via c7926fe8890a80bb3e9072e903dcadcf4faac4cf (commit)
via a41cf74b1836899ad9e3c80a8013446e849049ed (commit)
via 41aa789e0b1d498e0a160bc2848c9a16fea9d2b5 (commit)
via cc7832e9bcfea870de73911f1017bdef6a9ff956 (commit)
via aa1ab4c0c975ca81ca7005e0359573836e930530 (commit)
via 1704cd340e9851e0041d275be54bb7be21b40288 (commit)
via 8de218ceaf8bd1c6a122f245228aa885c82985a7 (commit)
via 986d8c78d428c6d7ac5d3a8e4ada86e65901ad99 (commit)
via 21b23658deecb8a8ae0b0be1c7dbd53adb694fe2 (commit)
via 94af779a19c7ed4227a396fd26f1bc22ee26699a (commit)
via 06455f35cf076326134621cc44a446681e6c90e4 (commit)
via ca5ef925eb1ae2a1e63ae1b0762ddbbef19e49a2 (commit)
via 490b2d6ee5146c7f097ba8a2759bf720d528abce (commit)
from 1d6b62aa619dd4eba44c77587fc51349b73c9ce5 (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=74adf4e543d506a44500d0aa9bf1203c2270b217
commit 74adf4e543d506a44500d0aa9bf1203c2270b217
Merge: 1d6b62a dfa27f0
Author: Stephen Kelly
AuthorDate: Tue Oct 4 16:57:34 2016 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 4 16:57:34 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
dfa27f07 cmLinkLineComputer: Extract from cmLocalGenerator
511ed264 cmLocalGenerator: Inline conversion into link computation
6e77e107 Ninja: Inline code into ConvertToLinkReference
e5f9caf1 Ninja: Add a new accessor method
abb1e1d2 Ninja: Extract a static path conversion method
ee661eb0 Ninja: Inline conversion to relative path
ec5115ea Ninja: Get the binary directory from cmState::Directory
44aa69e7 Ninja: Inline output path conversion
4bd19454 Ninja: Simplify method
80816002 cmLocalGenerator: Simplify ConvertToLinkReference
fb932b36 cmOutputConverter: Add a flag for IsUnix
608e6fe5 Convert: Inline platform-specific methods
5dcf248b Ninja: Extract identical code from condition
3288481c Ninja: Replace array access with local variable
c7926fe8 Ninja: Separate two coupled calls
a41cf74b Makefiles: Introduce local RelativePath method
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfa27f07b492d1aaa94b32a11b4e24ca73d5e420
commit dfa27f07b492d1aaa94b32a11b4e24ca73d5e420
Author: Stephen Kelly
AuthorDate: Tue Oct 4 22:56:34 2016 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 4 22:56:34 2016 +0200
cmLinkLineComputer: Extract from cmLocalGenerator
CMake has several classes which have too many responsibilities.
cmLocalGenerator is one of them. Start to extract the link line
computation. Create generator-specific implementations of the interface
to account for generator-specific behavior.
Unfortunately MSVC60 has different behavior to everything else and CMake
still generates makefiles for it. Isolate it with MSVC60-specific
names.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ec49481..81108ad 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -300,6 +300,8 @@ set(SRCS
cmInstallDirectoryGenerator.cxx
cmLinkedTree.h
cmLinkItem.h
+ cmLinkLineComputer.cxx
+ cmLinkLineComputer.h
cmListFileCache.cxx
cmListFileCache.h
cmListFileLexer.c
@@ -318,6 +320,8 @@ set(SRCS
cmMakefileUtilityTargetGenerator.cxx
cmMessenger.cxx
cmMessenger.h
+ cmMSVC60LinkLineComputer.cxx
+ cmMSVC60LinkLineComputer.h
cmOSXBundleGenerator.cxx
cmOSXBundleGenerator.h
cmOutputConverter.cxx
@@ -543,6 +547,8 @@ set(SRCS ${SRCS}
cmNinjaNormalTargetGenerator.h
cmNinjaUtilit
[Cmake-commits] CMake branch, next, updated. v3.6.2-2259-g828f247
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 828f247c9bb36f6e378c773497b6ce0b333839b5 (commit)
via 3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2 (commit)
from 98220cb3c9dc8a01db12ecfb224ffbd45052fc7b (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=828f247c9bb36f6e378c773497b6ce0b333839b5
commit 828f247c9bb36f6e378c773497b6ce0b333839b5
Merge: 98220cb 3e3ebea
Author: Stephen Kelly
AuthorDate: Mon Sep 19 16:05:19 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 19 16:05:19 2016 -0400
Merge topic 'cleanup-Convert' into next
3e3ebeab Convert: Simplify switch
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2
commit 3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:48:57 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Sep 19 22:04:48 2016 +0200
Convert: Simplify switch
Make it more clear what is happening here.
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index cc3ee93f..4f12ae0 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -53,15 +53,14 @@ std::string cmOutputConverter::ConvertToRelativePath(
switch (relative) {
case HOME_OUTPUT:
- result = this->ConvertToRelativePath(
-this->GetState()->GetBinaryDirectory(), source);
+ result = this->GetState()->GetBinaryDirectory();
break;
case START_OUTPUT:
- result = this->ConvertToRelativePath(
-this->StateSnapshot.GetDirectory().GetCurrentBinary(), source);
+ result = this->StateSnapshot.GetDirectory().GetCurrentBinary();
break;
}
- return result;
+
+ return this->ConvertToRelativePath(result, source);
}
std::string cmOutputConverter::Convert(const std::string& source,
---
Summary of changes:
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.6.2-2257-g98220cb
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 98220cb3c9dc8a01db12ecfb224ffbd45052fc7b (commit)
via b5fa39ca3bdbcae327a04d4efb1cbe2477acc413 (commit)
from 27d1525298d909d3272f287e479ec401d78cf29a (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=98220cb3c9dc8a01db12ecfb224ffbd45052fc7b
commit 98220cb3c9dc8a01db12ecfb224ffbd45052fc7b
Merge: 27d1525 b5fa39c
Author: Stephen Kelly
AuthorDate: Mon Sep 19 16:04:32 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 19 16:04:32 2016 -0400
Merge topic 'cleanup-Convert' into next
b5fa39ca Partial revert
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5fa39ca3bdbcae327a04d4efb1cbe2477acc413
commit b5fa39ca3bdbcae327a04d4efb1cbe2477acc413
Author: Stephen Kelly
AuthorDate: Mon Sep 19 22:03:34 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Sep 19 22:03:41 2016 +0200
Partial revert
Avoid conflicting with other branch.
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index fdf0b0e..6167e2c 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -47,6 +47,13 @@ std::string const& cmCommonTargetGenerator::GetConfigName()
const
return this->ConfigName;
}
+std::string cmCommonTargetGenerator::Convert(
+ std::string const& source, cmOutputConverter::RelativeRoot relative,
+ cmOutputConverter::OutputFormat output)
+{
+ return this->LocalGenerator->Convert(source, relative, output);
+}
+
const char* cmCommonTargetGenerator::GetFeature(const std::string& feature)
{
return this->GeneratorTarget->GetFeature(feature, this->ConfigName);
@@ -197,9 +204,8 @@ std::string cmCommonTargetGenerator::GetManifests()
std::vector manifests;
for (std::vector::iterator mi = manifest_srcs.begin();
mi != manifest_srcs.end(); ++mi) {
-manifests.push_back(this->LocalGenerator->ConvertToOutputFormat(
- this->LocalGenerator->ConvertToRelativePath(
-this->LocalGenerator->GetWorkingDirectory(), (*mi)->GetFullPath()),
+manifests.push_back(this->Convert(
+ (*mi)->GetFullPath(), this->LocalGenerator->GetWorkingDirectory(),
cmOutputConverter::SHELL));
}
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index 4c52fe5..b433c18 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -57,6 +57,10 @@ protected:
// The windows module definition source file (.def), if any.
cmSourceFile const* ModuleDefinitionFile;
+ std::string Convert(std::string const& source,
+ cmOutputConverter::RelativeRoot relative,
+ cmOutputConverter::OutputFormat output);
+
void AppendFortranFormatFlags(std::string& flags,
cmSourceFile const& source);
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index ba0617f..d7e2c33 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -428,16 +428,14 @@ bool cmDependsFortran::WriteDependenciesReal(const char*
obj,
std::string modFile = mod_dir;
modFile += "/";
modFile += *i;
- modFile = this->LocalGenerator->ConvertToOutputFormat(
-this->LocalGenerator->ConvertToRelativePath(binDir, modFile),
-cmOutputConverter::SHELL);
+ modFile = this->LocalGenerator->Convert(
+modFile, cmOutputConverter::HOME_OUTPUT, cmOutputConverter::SHELL);
std::string stampFile = stamp_dir;
stampFile += "/";
stampFile += m;
stampFile += ".mod.stamp";
- stampFile = this->LocalGenerator->ConvertToOutputFormat(
-this->LocalGenerator->ConvertToRelativePath(binDir, stampFile),
-cmOutputConverter::SHELL);
+ stampFile = this->LocalGenerator->Convert(
+stampFile, cmOutputConverter::HOME_OUTPUT, cmOutputConverter::SHELL);
makeDepends << "\t$(CMAKE_COMMAND) -E cmake_copy_f90_mod " << modFile
<< " " << stampFile;
cmMakefile* mf = this->LocalGenerator->GetMakefile();
diff --git a/Source/cmLocalCommonGenerator.cxx
b/Source/cmLocalCommonGenerator.cxx
index 97323c9..0e79293 100644
--- a/Source/cmLocalCommonGenerator.cxx
+++ b/Source/cmLocalCommonGenerator.cxx
@@ -18,9 +18,8 @@
class cmGlobalGenerator;
-cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* g
[Cmake-commits] CMake branch, next, updated. v3.6.2-2253-g253d0ee
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 253d0ee84d3b86d8594bd7b82ed60f5464150295 (commit)
via bd17b5db0ea713558c2eb6f17082e0346b40f754 (commit)
via 74546d2fad1f329d26ea78b8dd79fb7c0983f333 (commit)
via 9c75197a6a074ca39ef4ac812a0d006097f9595d (commit)
via c4cdb97b64167f6413f877b630d2e4affe783fc3 (commit)
via 6f0b87d59589dc441e6408a4884cb464e361 (commit)
via 29332ff96a1d237e55e367f4a335b51a095158e7 (commit)
via cc72d3dd553f0764ec74d76bd5d181875d9531f5 (commit)
via 2ea0de3749ed34091ef4e3a6bfcc20a5c46d4575 (commit)
via b861903f601cba1b4f2f77c82dd33aedf3ac8f78 (commit)
via 7c8a64c710f8ba74c0688c2ba3d8276c05811a78 (commit)
via fbec0e8a0523909ffac9bdc0a6961724acdf65d6 (commit)
via 3e1b1556227b87bd7dafd46e65611eafc15c323c (commit)
via 5e87fe3fa4fa0246c34a98c803f67873cb3d18ce (commit)
via a215ad8b1def445b86b457fe85026bfd9395ea1b (commit)
via c026b3ab9f409474c207a4e28d982d135e5c182f (commit)
via 52e967ce80d0e5e56c3c028dcf6b3346d0386907 (commit)
via f1d845ae74dd9ba0520b1f97c851e439f1c4df07 (commit)
via 0a98c74c1ba025957b2a3933d9897750109390bf (commit)
via 495e26ae57fc8f6a38f77ea0d0984fa2a3abe6c1 (commit)
via 4f68b2070fb90c50eb677dc74298f30ca13648a6 (commit)
from 7696577b49c993f43dd779554c6d03eb9f65ae74 (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=253d0ee84d3b86d8594bd7b82ed60f5464150295
commit 253d0ee84d3b86d8594bd7b82ed60f5464150295
Merge: 7696577 bd17b5d
Author: Stephen Kelly
AuthorDate: Mon Sep 19 15:48:57 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 19 15:48:57 2016 -0400
Merge topic 'cleanup-Convert' into next
bd17b5db cmOutputConverter: Remove now-obsolete Convert method
74546d2f Convert: Inline uses of START_OUTPUT
9c75197a Convert: Remove HOME_OUTPUT enum value
c4cdb97b Ninja: Update comment variable reference
6f0b87d5 Convert: Move access to BinaryDirectory out of loops
29332ff9 Convert: Inline uses of HOME_OUTPUT
cc72d3dd Common: Use a string instead of enum for WorkingDirectory
2ea0de37 Convert: Simplify switch
b861903f Convert: Remove obsolete MAKERULE enum value
7c8a64c7 Convert: Move access to BinaryDirectory out of loops
fbec0e8a Convert: Inline HOME_OUTPUT MAKERULE conversion
3e1b1556 Convert: Inline MAKERULE conversions
5e87fe3f Convert: Move access to BinaryDirectory out of loops
a215ad8b Convert: Avoid HOME_OUTPUT enum when converting to relative paths
c026b3ab Convert: Move access to CurrentBinaryDirectory out of loops
52e967ce Convert: Avoid START_OUTPUT enum when converting to relative paths
...
diff --cc Source/cmLocalCommonGenerator.cxx
index 2de28b8,97323c9..1e708c8
--- a/Source/cmLocalCommonGenerator.cxx
+++ b/Source/cmLocalCommonGenerator.cxx
@@@ -53,13 -54,11 +54,14 @@@ std::string cmLocalCommonGenerator::Get
}
// Add a module output directory flag if necessary.
- std::string mod_dir = target->GetFortranModuleDirectory();
+ std::string mod_dir = target->GetFortranModuleDirectory(
+this->WorkingDirectory == cmOutputConverter::HOME_OUTPUT
+ ? this->GetBinaryDirectory()
+ : this->GetCurrentBinaryDirectory());
if (!mod_dir.empty()) {
- mod_dir =
- this->Convert(mod_dir, this->WorkingDirectory,
cmOutputConverter::SHELL);
+ mod_dir = this->ConvertToOutputFormat(
+ this->ConvertToRelativePath(this->WorkingDirectory, mod_dir),
+ cmOutputConverter::SHELL);
} else {
mod_dir =
this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_DEFAULT");
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd17b5db0ea713558c2eb6f17082e0346b40f754
commit bd17b5db0ea713558c2eb6f17082e0346b40f754
Author: Stephen Kelly
AuthorDate: Sat Aug 27 19:01:20 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Sep 19 21:36:15 2016 +0200
cmOutputConverter: Remove now-obsolete Convert method
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index df68280..fdf0b0e 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -47,13 +47,6 @@ std::string const& cmCommonTargetGenerator::GetConfigName()
const
return this->ConfigName;
}
-std::string cmCommonTargetGenerator::Convert(
- std::string const& source, cmOutputConverter::RelativeRoot relative,
- cmOutputConverter::OutputFormat output)
-{
- ret
[Cmake-commits] CMake branch, next, updated. v3.6.2-2175-g52d2520
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 52d2520d39abeefe97ce69ff3029f487bf285d53 (commit)
via 6afd35b98a2316685a071a43d0e56448e7ab9ed5 (commit)
from e61400cafdfce42049cbd7c88cf56ddc4217b483 (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=52d2520d39abeefe97ce69ff3029f487bf285d53
commit 52d2520d39abeefe97ce69ff3029f487bf285d53
Merge: e61400c 6afd35b
Author: Stephen Kelly
AuthorDate: Sat Sep 17 13:49:50 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Sep 17 13:49:50 2016 -0400
Merge topic 'cleanup-Convert' into next
6afd35b9 cmState: remove unused code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6afd35b98a2316685a071a43d0e56448e7ab9ed5
commit 6afd35b98a2316685a071a43d0e56448e7ab9ed5
Author: Daniel Pfeifer
AuthorDate: Thu Jun 16 23:15:03 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Sep 17 19:49:21 2016 +0200
cmState: remove unused code
Remove the code that was used by cmOutputConverter exclusively.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 073c239..ffb104b 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -77,8 +77,6 @@ struct cmState::BuildsystemDirectoryStateType
std::string Location;
std::string OutputLocation;
- std::vector CurrentSourceDirectoryComponents;
- std::vector CurrentBinaryDirectoryComponents;
// The top-most directories for relative path conversion. Both the
// source and destination location of a relative path conversion
// must be underneath one of these directories (both under source or
@@ -591,10 +589,6 @@ void cmState::SetSourceDirectory(std::string const&
sourceDirectory)
{
this->SourceDirectory = sourceDirectory;
cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory);
-
- cmSystemTools::SplitPath(
-cmSystemTools::CollapseFullPath(this->SourceDirectory),
-this->SourceDirectoryComponents);
}
const char* cmState::GetSourceDirectory() const
@@ -602,19 +596,10 @@ const char* cmState::GetSourceDirectory() const
return this->SourceDirectory.c_str();
}
-std::vector const& cmState::GetSourceDirectoryComponents() const
-{
- return this->SourceDirectoryComponents;
-}
-
void cmState::SetBinaryDirectory(std::string const& binaryDirectory)
{
this->BinaryDirectory = binaryDirectory;
cmSystemTools::ConvertToUnixSlashes(this->BinaryDirectory);
-
- cmSystemTools::SplitPath(
-cmSystemTools::CollapseFullPath(this->BinaryDirectory),
-this->BinaryDirectoryComponents);
}
void cmState::SetWindowsShell(bool windowsShell)
@@ -692,11 +677,6 @@ const char* cmState::GetBinaryDirectory() const
return this->BinaryDirectory.c_str();
}
-std::vector const& cmState::GetBinaryDirectoryComponents() const
-{
- return this->BinaryDirectoryComponents;
-}
-
void cmState::Directory::ComputeRelativePathTopSource()
{
// Relative path conversion inside the source tree is not used to
@@ -978,8 +958,6 @@ void cmState::Directory::SetCurrentSource(std::string
const& dir)
cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc);
- cmSystemTools::SplitPath(
-loc, this->DirectoryState->CurrentSourceDirectoryComponents);
this->ComputeRelativePathTopSource();
this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc);
@@ -997,8 +975,6 @@ void cmState::Directory::SetCurrentBinary(std::string
const& dir)
cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc);
- cmSystemTools::SplitPath(
-loc, this->DirectoryState->CurrentBinaryDirectoryComponents);
this->ComputeRelativePathTopBinary();
this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc);
@@ -1009,18 +985,6 @@ void cmState::Snapshot::SetListFile(const std::string&
listfile)
*this->Position->ExecutionListFile = listfile;
}
-std::vector const&
-cmState::Directory::GetCurrentSourceComponents() const
-{
- return this->DirectoryState->CurrentSourceDirectoryComponents;
-}
-
-std::vector const&
-cmState::Directory::GetCurrentBinaryComponents() const
-{
- return this->DirectoryState->CurrentBinaryDirectoryComponents;
-}
-
const char* cmState::Directory::GetRelativePathTopSource() const
{
return this->DirectoryState->RelativePathTopSource.c_str();
diff --git a/Source/cmState.h b/Source/cmState.h
index 9ab4213..0fac42c 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -135,9 +135,6 @@ public:
const char* Ge
[Cmake-commits] CMake branch, next, updated. v3.6.2-2173-ge61400c
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 e61400cafdfce42049cbd7c88cf56ddc4217b483 (commit)
via 92d14662cd0b5adebe17c3ae0c1662fc9ee5f728 (commit)
from 229c3f4b30b3cd49d12e2ad74fdf92c7503f0bdc (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=e61400cafdfce42049cbd7c88cf56ddc4217b483
commit e61400cafdfce42049cbd7c88cf56ddc4217b483
Merge: 229c3f4 92d1466
Author: Stephen Kelly
AuthorDate: Sat Sep 17 13:48:22 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Sep 17 13:48:22 2016 -0400
Merge topic 'cleanup-Convert' into next
92d14662 Revert most of this branch
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92d14662cd0b5adebe17c3ae0c1662fc9ee5f728
commit 92d14662cd0b5adebe17c3ae0c1662fc9ee5f728
Author: Stephen Kelly
AuthorDate: Sat Sep 17 19:47:03 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Sep 17 19:47:18 2016 +0200
Revert most of this branch
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index fdf0b0e..6167e2c 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -47,6 +47,13 @@ std::string const& cmCommonTargetGenerator::GetConfigName()
const
return this->ConfigName;
}
+std::string cmCommonTargetGenerator::Convert(
+ std::string const& source, cmOutputConverter::RelativeRoot relative,
+ cmOutputConverter::OutputFormat output)
+{
+ return this->LocalGenerator->Convert(source, relative, output);
+}
+
const char* cmCommonTargetGenerator::GetFeature(const std::string& feature)
{
return this->GeneratorTarget->GetFeature(feature, this->ConfigName);
@@ -197,9 +204,8 @@ std::string cmCommonTargetGenerator::GetManifests()
std::vector manifests;
for (std::vector::iterator mi = manifest_srcs.begin();
mi != manifest_srcs.end(); ++mi) {
-manifests.push_back(this->LocalGenerator->ConvertToOutputFormat(
- this->LocalGenerator->ConvertToRelativePath(
-this->LocalGenerator->GetWorkingDirectory(), (*mi)->GetFullPath()),
+manifests.push_back(this->Convert(
+ (*mi)->GetFullPath(), this->LocalGenerator->GetWorkingDirectory(),
cmOutputConverter::SHELL));
}
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index 4c52fe5..b433c18 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -57,6 +57,10 @@ protected:
// The windows module definition source file (.def), if any.
cmSourceFile const* ModuleDefinitionFile;
+ std::string Convert(std::string const& source,
+ cmOutputConverter::RelativeRoot relative,
+ cmOutputConverter::OutputFormat output);
+
void AppendFortranFormatFlags(std::string& flags,
cmSourceFile const& source);
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 3296ffc..fbbf42f 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -239,18 +239,19 @@ bool cmDependsC::WriteDependencies(const
std::set& sources,
// written by the original local generator for this directory
// convert the dependencies to paths relative to the home output
// directory. We must do the same here.
- std::string binDir = this->LocalGenerator->GetBinaryDirectory();
- std::string obj_i = this->LocalGenerator->ConvertToRelativePath(binDir, obj);
- std::string obj_m = cmSystemTools::ConvertToOutputPath(obj_i.c_str());
+ std::string obj_i = this->LocalGenerator->ConvertToRelativePath(
+obj, cmOutputConverter::HOME_OUTPUT);
+ std::string obj_m = this->LocalGenerator->ConvertToOutputFormat(
+obj_i, cmOutputConverter::MAKERULE);
internalDepends << obj_i << std::endl;
for (std::set::const_iterator i = dependencies.begin();
i != dependencies.end(); ++i) {
-makeDepends
- << obj_m << ": "
- << cmSystemTools::ConvertToOutputPath(
- this->LocalGenerator->ConvertToRelativePath(binDir, *i).c_str())
- << std::endl;
+makeDepends << obj_m << ": "
+<< this->LocalGenerator->Convert(
+ *i, cmOutputConverter::HOME_OUTPUT,
+ cmOutputConverter::MAKERULE)
+<< std::endl;
internalDepends << " " << *i << std::endl;
}
makeDepends << std::endl;
diff --git a/Source/cmDependsFortran.cxx b/Sour
[Cmake-commits] CMake branch, next, updated. v3.6.2-2168-g4e952da
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 4e952dabb663c8c65844d608d76f7bb7c691ab00 (commit) via d4f89562594107111e197d4022546ec2c033fe4f (commit) from fe8976265416da8333cd7497d8d41db177b23769 (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=4e952dabb663c8c65844d608d76f7bb7c691ab00 commit 4e952dabb663c8c65844d608d76f7bb7c691ab00 Merge: fe89762 d4f8956 Author: Stephen Kelly AuthorDate: Sat Sep 17 06:15:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Sep 17 06:15:31 2016 -0400 Merge topic 'predictable-add_custom_command-output' into next d4f89562 fixup! Make the add_custom_command output more predictable https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4f89562594107111e197d4022546ec2c033fe4f commit d4f89562594107111e197d4022546ec2c033fe4f Author: Stephen Kelly AuthorDate: Sat Sep 17 12:15:11 2016 +0200 Commit: Stephen Kelly CommitDate: Sat Sep 17 12:15:11 2016 +0200 fixup! Make the add_custom_command output more predictable diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt index b643b57..cd542d8 100644 --- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt +++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt @@ -1,7 +1,7 @@ CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): add_custom_command given APPEND option with output - ".*RunCMake/add_custom_command/AppendNotOutput-build/out" + .*RunCMake/add_custom_command/AppendNotOutput-build/out.* which is not already a custom command output. Call Stack \(most recent call first\): --- Summary of changes: Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt |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.6.2-2166-gfe89762
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 fe8976265416da8333cd7497d8d41db177b23769 (commit) via 18d4ce24bba376cddd0f0430de906814535b9069 (commit) from cade5c78ff25278826bc1690084230a04994a6e6 (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=fe8976265416da8333cd7497d8d41db177b23769 commit fe8976265416da8333cd7497d8d41db177b23769 Merge: cade5c7 18d4ce2 Author: Stephen Kelly AuthorDate: Sat Sep 17 04:55:12 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Sep 17 04:55:12 2016 -0400 Merge topic 'predictable-add_custom_command-output' into next 18d4ce24 Make the add_custom_command output more predictable https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d4ce24bba376cddd0f0430de906814535b9069 commit 18d4ce24bba376cddd0f0430de906814535b9069 Author: Stephen Kelly AuthorDate: Thu Sep 8 01:20:35 2016 +0200 Commit: Stephen Kelly CommitDate: Sat Sep 17 10:22:24 2016 +0200 Make the add_custom_command output more predictable I otherwise get: Expected stderr to match: expect-err> CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): expect-err> add_custom_command given APPEND option with output.* expect-err> which is not already a custom command output. expect-err> Call Stack \(most recent call first\): expect-err> CMakeLists.txt:3 \(include\) Actual stderr: actual-err> CMake Error at AppendNotOutput.cmake:1 (add_custom_command): actual-err> add_custom_command given APPEND option with output actual-err> "/home/stephen/dev/src/cmake/with actual-err> space/Tests/RunCMake/add_custom_command/AppendNotOutput-build/out" which is actual-err> not already a custom command output. actual-err> Call Stack (most recent call first): actual-err> CMakeLists.txt:3 (include) Using a specific line for paths is a style already used elsewhere for the same reason, such as CMP0041 output. diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx index 2c4a4ca..2e28498 100644 --- a/Source/cmAddCustomCommandCommand.cxx +++ b/Source/cmAddCustomCommandCommand.cxx @@ -263,8 +263,8 @@ bool cmAddCustomCommandCommand::InitialPass( // No command for this output exists. std::ostringstream e; -e << "given APPEND option with output \"" << output[0] - << "\" which is not already a custom command output."; +e << "given APPEND option with output\n\"" << output[0] + << "\"\nwhich is not already a custom command output."; this->SetError(e.str()); return false; } diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt index 96d0972..b643b57 100644 --- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt +++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt @@ -1,5 +1,8 @@ CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): - add_custom_command given APPEND option with output.* + add_custom_command given APPEND option with output + + ".*RunCMake/add_custom_command/AppendNotOutput-build/out" + which is not already a custom command output. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) --- Summary of changes: Source/cmAddCustomCommandCommand.cxx |4 ++-- Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt |5 - 2 files changed, 6 insertions(+), 3 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.6.2-2164-gcade5c7
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 cade5c78ff25278826bc1690084230a04994a6e6 (commit)
via 5683e63cca186ef87e4601616be013421a8aad54 (commit)
via daf862ae62ad9c11e6352a02068922b42acf2919 (commit)
via 2ad43682e3f665a59e54746d039a7577b976ca6f (commit)
via 95ac2339588d0d16f21327c16b098f4c54b5d67b (commit)
via bcab65ad983297e1455f43ea9e06f38170e9bb75 (commit)
via aab066a87b18d6ca2be47fbd5c2a6b8dd8e287a9 (commit)
via ca466374c54031b22018519868d70c9e917df8d1 (commit)
via 0e9c972fc2cc3d4338890a5e4528bfd7a8b22fc1 (commit)
via ce2c74c4783f0de4493268c27b3aecd5ddecb135 (commit)
via 6f1f8f6299a8f7e05e839573b5f1ae4ce1ad1ea2 (commit)
via 8e1d9db85bd462c8226550f4bea988ff6b220ac5 (commit)
via c282b12f815a95135c2347f022263efcdea1544b (commit)
via 257265241a791b96a219133d0eba22b9e2b71468 (commit)
via 8f4b0756bd6bd8e5a1a6055af373972abf66de54 (commit)
via b25b70e36e2620b4e8480af62fb7d77babff59a4 (commit)
via 2fe53afb2ca99257143cb89e633b7a4fe84265cb (commit)
via 1b855d76829ea3633eea0ec608e5cbabf18c06ff (commit)
via 983421d8048c44f33704dba4b1302eeadd600463 (commit)
via 94a51b0185fde6210056cd3b3b5526bb5e0ed830 (commit)
via 5d3f0e12ed94c4048ef24025f1674692474b7602 (commit)
via 3d87bd9725341f76ba95f6063b177021dd84a583 (commit)
via 11ad1af8a35a744413b405c5c86e1dbdab38c430 (commit)
via 8d47a20f131147d4cf38e63df0c382ec5844a833 (commit)
via 149af87b86362449a99301860af5aac1a3b4b20c (commit)
from a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa (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=cade5c78ff25278826bc1690084230a04994a6e6
commit cade5c78ff25278826bc1690084230a04994a6e6
Merge: a1d30dc 5683e63
Author: Stephen Kelly
AuthorDate: Sat Sep 17 04:50:52 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Sep 17 04:50:52 2016 -0400
Merge topic 'cleanup-Convert' into next
5683e63c cmOutputConverter: Remove now-obsolete Convert method
daf862ae Convert: Inline uses of START_OUTPUT
2ad43682 Convert: Remove HOME_OUTPUT enum value
95ac2339 Ninja: Update comment variable reference
bcab65ad Convert: Move access to BinaryDirectory out of loops
aab066a8 Convert: Inline uses of HOME_OUTPUT
ca466374 Common: Use a string instead of enum for WorkingDirectory
0e9c972f Convert: Simplify switch
ce2c74c4 Convert: Remove obsolete MAKERULE enum value
6f1f8f62 Convert: Move access to BinaryDirectory out of loops
8e1d9db8 Convert: Inline HOME_OUTPUT MAKERULE conversion
c282b12f Convert: Inline MAKERULE conversions
25726524 Convert: Move access to BinaryDirectory out of loops
8f4b0756 Convert: Avoid HOME_OUTPUT enum when converting to relative paths
b25b70e3 Convert: Move access to CurrentBinaryDirectory out of loops
2fe53afb Convert: Avoid START_OUTPUT enum when converting to relative paths
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5683e63cca186ef87e4601616be013421a8aad54
commit 5683e63cca186ef87e4601616be013421a8aad54
Author: Stephen Kelly
AuthorDate: Sat Aug 27 19:01:20 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Sep 17 10:32:48 2016 +0200
cmOutputConverter: Remove now-obsolete Convert method
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index df68280..fdf0b0e 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -47,13 +47,6 @@ std::string const& cmCommonTargetGenerator::GetConfigName()
const
return this->ConfigName;
}
-std::string cmCommonTargetGenerator::Convert(
- std::string const& source, cmOutputConverter::RelativeRoot relative,
- cmOutputConverter::OutputFormat output)
-{
- return this->LocalGenerator->Convert(source, relative, output);
-}
-
const char* cmCommonTargetGenerator::GetFeature(const std::string& feature)
{
return this->GeneratorTarget->GetFeature(feature, this->ConfigName);
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index b433c18..4c52fe5 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -57,10 +57,6 @@ protected:
// The windows module definition source file (.def), if any.
cmSourceFile const* ModuleDefinitionFile;
- std::string Convert(std::string const& source,
- cmOutputConverter::RelativeRoot relative,
- cmOutputConverter::OutputFormat o
[Cmake-commits] CMake branch, next, updated. v3.6.1-1571-g0dd8dc6
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 0dd8dc67bc08d52744d501bdbedd077d2a1641a9 (commit)
via 9cc5a4dd1f6d764830c7da33fa0c735124b6cd80 (commit)
via d71230b33fea484a758726f12dc98bed95b5336c (commit)
via f4028af43e062cb4b01e743236fd3efc3d0ff47d (commit)
via e5d8ff5cf57be72c60911b6e2bf5e47dd8ad4c04 (commit)
from 32389a10550df33224522978f5b9d6794c628d55 (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=0dd8dc67bc08d52744d501bdbedd077d2a1641a9
commit 0dd8dc67bc08d52744d501bdbedd077d2a1641a9
Merge: 32389a1 9cc5a4d
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:41:31 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:41:31 2016 -0400
Merge topic 'cleanup-Convert' into next
9cc5a4dd Convert: Make variables a bit more clear
d71230b3 Convert: Remove UNCHANGED enum value
f4028af4 Convert: Remove 'FULL' conversion
e5d8ff5c Convert: Replace Convert(FULL) with equivalent
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cc5a4dd1f6d764830c7da33fa0c735124b6cd80
commit 9cc5a4dd1f6d764830c7da33fa0c735124b6cd80
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:58 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:41:18 2016 +0200
Convert: Make variables a bit more clear
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index f056a1b..630da42 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -49,26 +49,26 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
std::string cmOutputConverter::ConvertToRelativePath(
const std::string& source, RelativeRoot relative) const
{
- std::string result = source;
+ std::string result;
switch (relative) {
case HOME:
result = this->ConvertToRelativePath(
-this->GetState()->GetSourceDirectoryComponents(), result);
+this->GetState()->GetSourceDirectoryComponents(), source);
break;
case START:
result = this->ConvertToRelativePath(
this->StateSnapshot.GetDirectory().GetCurrentSourceComponents(),
-result);
+source);
break;
case HOME_OUTPUT:
result = this->ConvertToRelativePath(
-this->GetState()->GetBinaryDirectoryComponents(), result);
+this->GetState()->GetBinaryDirectoryComponents(), source);
break;
case START_OUTPUT:
result = this->ConvertToRelativePath(
this->StateSnapshot.GetDirectory().GetCurrentBinaryComponents(),
-result);
+source);
break;
}
return result;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d71230b33fea484a758726f12dc98bed95b5336c
commit d71230b33fea484a758726f12dc98bed95b5336c
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:57 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:41:17 2016 +0200
Convert: Remove UNCHANGED enum value
It is no longer used.
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index d3f9d64..b433c18 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -57,9 +57,9 @@ protected:
// The windows module definition source file (.def), if any.
cmSourceFile const* ModuleDefinitionFile;
- std::string Convert(
-std::string const& source, cmOutputConverter::RelativeRoot relative,
-cmOutputConverter::OutputFormat output = cmOutputConverter::UNCHANGED);
+ std::string Convert(std::string const& source,
+ cmOutputConverter::RelativeRoot relative,
+ cmOutputConverter::OutputFormat output);
void AppendFortranFormatFlags(std::string& flags,
cmSourceFile const& source);
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index c2403db..9af9659 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -45,7 +45,6 @@ public:
};
enum OutputFormat
{
-UNCHANGED,
MAKERULE,
SHELL,
WATCOMQUOTE,
@@ -54,7 +53,7 @@ public:
std::string ConvertToOutputFormat(const std::string& source,
OutputFormat output) const;
std::string Convert(const std::string& remote, RelativeRoot local,
- OutputFormat output = UNCHANGED) const;
+ OutputFormat output) const;
std::string ConvertToRelativePath(const std::string& remote,
RelativeRoot local) const;
[Cmake-commits] CMake branch, next, updated. v3.6.1-1566-g32389a1
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 32389a10550df33224522978f5b9d6794c628d55 (commit) via 9040d96d3dad86d081f76f957e9dfc54b7379406 (commit) from 799348a2d38e6237561168184fcab801262ffe3a (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=32389a10550df33224522978f5b9d6794c628d55 commit 32389a10550df33224522978f5b9d6794c628d55 Merge: 799348a 9040d96 Author: Stephen Kelly AuthorDate: Sat Aug 27 09:41:09 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Aug 27 09:41:09 2016 -0400 Merge topic 'cleanup-Convert' into next 9040d96d format code https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9040d96d3dad86d081f76f957e9dfc54b7379406 commit 9040d96d3dad86d081f76f957e9dfc54b7379406 Author: Stephen Kelly AuthorDate: Sat Aug 27 15:40:44 2016 +0200 Commit: Stephen Kelly CommitDate: Sat Aug 27 15:40:47 2016 +0200 format code diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 660483e..7fa35b8 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -665,14 +665,16 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables( makefileStream << "# The top-level source directory on which CMake was run.\n" << "CMAKE_SOURCE_DIR = " -<< this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(this->GetSourceDirectory()), +<< this->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(this->GetSourceDirectory()), cmOutputConverter::SHELL) << "\n" << "\n"; makefileStream << "# The top-level build directory on which CMake was run.\n" << "CMAKE_BINARY_DIR = " -<< this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(this->GetBinaryDirectory()), +<< this->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(this->GetBinaryDirectory()), cmOutputConverter::SHELL) << "\n" << "\n"; --- Summary of changes: Source/cmLocalUnixMakefileGenerator3.cxx |6 -- 1 file changed, 4 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.6.1-1564-g799348a
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 799348a2d38e6237561168184fcab801262ffe3a (commit)
via 0bfbf20d0abf33e79f29b30989681b93905b71bb (commit)
via e638beafc895732f2e1ebb91bd6f5c8ea7989f28 (commit)
via 8770a8e095d9c6a8da636054bdf0ac72f3659e42 (commit)
via 25cb07603b4381a857f39189bd96e3dfec9bef20 (commit)
via ef50bcbd7b73dab0bd20ec0b9ae72aab01511bc6 (commit)
via effa38cd6f4ef4b71e04733002871c492bc203e5 (commit)
via d34a12ad76c1566ecc4fe02ed25670b0d679540f (commit)
via 1e3dba183f2b00b25ef9a8ce3b02b8ee3f0fc256 (commit)
via fa8df52d0e03b45cb8a46f2c6e9647cee33fd60a (commit)
via 0a47e1d9ac4ffac21874daae332422e125e3aa41 (commit)
via 1bf869716b00f925b6a315737d8c5553b2d04a26 (commit)
via 8be68b73457470bf886b9d633142c8d3e91f1d80 (commit)
via d7bc7c89771a582fb390d2f8c922515acddaa2b5 (commit)
via 5761b1dd875d857991a0827e65b7128b73d7f8f7 (commit)
via 16dad45d29f6fc8a84c2ff5ae2ca7c098b532c9c (commit)
via e80e6644bb7f4eaf681390b5071a01856d6545d4 (commit)
via ab07619914e3857c213d733c8c46a1a439a85ed1 (commit)
via 85997982e51177c966c691dcd660b133b74f6229 (commit)
from e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e (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=799348a2d38e6237561168184fcab801262ffe3a
commit 799348a2d38e6237561168184fcab801262ffe3a
Merge: e0cb867 0bfbf20
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:28:12 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:28:12 2016 -0400
Merge topic 'cleanup-Convert' into next
0bfbf20d Convert: Make variables a bit more clear
e638beaf Convert: Remove UNCHANGED enum value
8770a8e0 Convert: Remove 'FULL' conversion
25cb0760 Convert: Replace Convert(FULL) with equivalent
ef50bcbd Ninja: Replace ternary with if()
effa38cd Convert: Replace trivial conversion with new method
d34a12ad Convert: Replace UNCHANGED conversions with new API call
1e3dba18 Convert: Extract ConvertToRelativePath from Convert()
fa8df52d Convert: Replace FULL conversions with equivalent
0a47e1d9 VS: Replace FULL/UNCHANGED conversion with equivalent
1bf86971 Convert: Remove NONE conversion
8be68b73 Convert: Replace uses of Convert(NONE)
d7bc7c89 VS: Replace variable with an if()
5761b1dd Makefiles: Replace ternaries with if()s
16dad45d Makefiles: Inline MakeLauncher into only caller
e80e6644 Makefiles: Simplify MakeLauncher return value
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bfbf20d0abf33e79f29b30989681b93905b71bb
commit 0bfbf20d0abf33e79f29b30989681b93905b71bb
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:58 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:26:38 2016 +0200
Convert: Make variables a bit more clear
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index f056a1b..630da42 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -49,26 +49,26 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
std::string cmOutputConverter::ConvertToRelativePath(
const std::string& source, RelativeRoot relative) const
{
- std::string result = source;
+ std::string result;
switch (relative) {
case HOME:
result = this->ConvertToRelativePath(
-this->GetState()->GetSourceDirectoryComponents(), result);
+this->GetState()->GetSourceDirectoryComponents(), source);
break;
case START:
result = this->ConvertToRelativePath(
this->StateSnapshot.GetDirectory().GetCurrentSourceComponents(),
-result);
+source);
break;
case HOME_OUTPUT:
result = this->ConvertToRelativePath(
-this->GetState()->GetBinaryDirectoryComponents(), result);
+this->GetState()->GetBinaryDirectoryComponents(), source);
break;
case START_OUTPUT:
result = this->ConvertToRelativePath(
this->StateSnapshot.GetDirectory().GetCurrentBinaryComponents(),
-result);
+source);
break;
}
return result;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e638beafc895732f2e1ebb91bd6f5c8ea7989f28
commit e638beafc895732f2e1ebb91bd6f5c8ea7989f28
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:57 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:26:38 2016 +0200
Convert: Remove UNCHANGED enum value
It is no longer used.
diff --git
[Cmake-commits] CMake branch, next, updated. v3.6.1-1545-ge0cb867
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 e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e (commit)
via 638f907bc6f61935714d688df20611fc65385c27 (commit)
from 11a80af5b291997c173df0451fddfa3aaa4f4752 (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=e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e
commit e0cb8675975b1ca4d3576c1f0847ff9a6bad1b1e
Merge: 11a80af 638f907
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:17:11 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:17:11 2016 -0400
Merge topic 'cleanup-Convert' into next
638f907b Makefiles: Replace method with Wacom specific API
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=638f907bc6f61935714d688df20611fc65385c27
commit 638f907bc6f61935714d688df20611fc65385c27
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:53 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:16:50 2016 +0200
Makefiles: Replace method with Wacom specific API
The existing method uses RelativeRoot NONE and FULL values. In
principle, those should be segregated interfaces. Mixing
NONE and FULL into the RelativeRoot enum is a case of
http://thedailywtf.com/articles/What_Is_Truth_0x3f_
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index f2ef5c8..2ef9a39 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -592,8 +592,8 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule(
}
}
-std::string cmLocalUnixMakefileGenerator3::ConvertShellCommand(
- std::string const& cmd, cmOutputConverter::RelativeRoot root)
+std::string cmLocalUnixMakefileGenerator3::MaybeConvertWacomShellCommand(
+ std::string const& cmd)
{
if (this->IsWatcomWMake() && cmSystemTools::FileIsFullPath(cmd.c_str()) &&
cmd.find_first_of("( )") != cmd.npos) {
@@ -606,7 +606,7 @@ std::string
cmLocalUnixMakefileGenerator3::ConvertShellCommand(
cmOutputConverter::SHELL);
}
}
- return this->Convert(cmd, root, cmOutputConverter::SHELL);
+ return std::string();
}
void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
@@ -638,8 +638,13 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
#endif
}
- std::string cmakeShellCommand = this->ConvertShellCommand(
-cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL);
+ std::string cmakeShellCommand =
+this->MaybeConvertWacomShellCommand(cmSystemTools::GetCMakeCommand());
+ if (cmakeShellCommand.empty()) {
+cmakeShellCommand =
+ this->Convert(cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL,
+cmOutputConverter::SHELL);
+ }
/* clang-format off */
makefileStream
@@ -975,7 +980,12 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
std::string launcher = this->MakeLauncher(
ccg, target, workingDir.empty() ? cmOutputConverter::START_OUTPUT
: cmOutputConverter::NONE);
- cmd = launcher + this->ConvertShellCommand(cmd, cmOutputConverter::NONE);
+ std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
+ if (shellCommand.empty()) {
+shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
+ cmOutputConverter::SHELL);
+ }
+ cmd = launcher + shellCommand;
ccg.AppendArguments(c, cmd);
if (content) {
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index 243cc3d..9541f65 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -250,8 +250,7 @@ protected:
void CheckMultipleOutputs(bool verbose);
private:
- std::string ConvertShellCommand(std::string const& cmd,
- cmOutputConverter::RelativeRoot root);
+ std::string MaybeConvertWacomShellCommand(std::string const& cmd);
std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
cmGeneratorTarget* target,
cmOutputConverter::RelativeRoot relative);
---
Summary of changes:
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.6.1-1543-g11a80af
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 11a80af5b291997c173df0451fddfa3aaa4f4752 (commit)
via 62f19fc531e2d3cc292005bcfaedc341966c01e9 (commit)
from a0d49a9213400b3bbb9f2505d09e47c3680a4680 (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=11a80af5b291997c173df0451fddfa3aaa4f4752
commit 11a80af5b291997c173df0451fddfa3aaa4f4752
Merge: a0d49a9 62f19fc
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:16:39 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:16:39 2016 -0400
Merge topic 'cleanup-Convert' into next
62f19fc5 fixup! Makefiles: Replace method with Wacom specific API
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62f19fc531e2d3cc292005bcfaedc341966c01e9
commit 62f19fc531e2d3cc292005bcfaedc341966c01e9
Author: Stephen Kelly
AuthorDate: Sat Aug 27 15:16:15 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:16:15 2016 +0200
fixup! Makefiles: Replace method with Wacom specific API
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 085cc91..2ef9a39 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -982,7 +982,8 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
: cmOutputConverter::NONE);
std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
if (shellCommand.empty()) {
-shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
cmOutputConverter::SHELL);
+shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
+ cmOutputConverter::SHELL);
}
cmd = launcher + shellCommand;
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx |3 ++-
1 file changed, 2 insertions(+), 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.6.1-1541-ga0d49a9
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 a0d49a9213400b3bbb9f2505d09e47c3680a4680 (commit)
via 8bdd65e82731fc93ad9a9c63658b104c50fca82b (commit)
from 4812110823f42f84573a23c87459afa91349995f (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=a0d49a9213400b3bbb9f2505d09e47c3680a4680
commit a0d49a9213400b3bbb9f2505d09e47c3680a4680
Merge: 4812110 8bdd65e
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:14:41 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:14:41 2016 -0400
Merge topic 'cleanup-Convert' into next
8bdd65e8 Makefiles: Replace method with Wacom specific API
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bdd65e82731fc93ad9a9c63658b104c50fca82b
commit 8bdd65e82731fc93ad9a9c63658b104c50fca82b
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:53 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:14:28 2016 +0200
Makefiles: Replace method with Wacom specific API
The existing method uses RelativeRoot NONE and FULL values. In
principle, those should be segregated interfaces. Mixing
NONE and FULL into the RelativeRoot enum is a case of
http://thedailywtf.com/articles/What_Is_Truth_0x3f_
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index f2ef5c8..085cc91 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -592,8 +592,8 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule(
}
}
-std::string cmLocalUnixMakefileGenerator3::ConvertShellCommand(
- std::string const& cmd, cmOutputConverter::RelativeRoot root)
+std::string cmLocalUnixMakefileGenerator3::MaybeConvertWacomShellCommand(
+ std::string const& cmd)
{
if (this->IsWatcomWMake() && cmSystemTools::FileIsFullPath(cmd.c_str()) &&
cmd.find_first_of("( )") != cmd.npos) {
@@ -606,7 +606,7 @@ std::string
cmLocalUnixMakefileGenerator3::ConvertShellCommand(
cmOutputConverter::SHELL);
}
}
- return this->Convert(cmd, root, cmOutputConverter::SHELL);
+ return std::string();
}
void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
@@ -638,8 +638,13 @@ void cmLocalUnixMakefileGenerator3::WriteMakeVariables(
#endif
}
- std::string cmakeShellCommand = this->ConvertShellCommand(
-cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL);
+ std::string cmakeShellCommand =
+this->MaybeConvertWacomShellCommand(cmSystemTools::GetCMakeCommand());
+ if (cmakeShellCommand.empty()) {
+cmakeShellCommand =
+ this->Convert(cmSystemTools::GetCMakeCommand(), cmOutputConverter::FULL,
+cmOutputConverter::SHELL);
+ }
/* clang-format off */
makefileStream
@@ -975,7 +980,11 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
std::string launcher = this->MakeLauncher(
ccg, target, workingDir.empty() ? cmOutputConverter::START_OUTPUT
: cmOutputConverter::NONE);
- cmd = launcher + this->ConvertShellCommand(cmd, cmOutputConverter::NONE);
+ std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
+ if (shellCommand.empty()) {
+shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
cmOutputConverter::SHELL);
+ }
+ cmd = launcher + shellCommand;
ccg.AppendArguments(c, cmd);
if (content) {
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index 243cc3d..9541f65 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -250,8 +250,7 @@ protected:
void CheckMultipleOutputs(bool verbose);
private:
- std::string ConvertShellCommand(std::string const& cmd,
- cmOutputConverter::RelativeRoot root);
+ std::string MaybeConvertWacomShellCommand(std::string const& cmd);
std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
cmGeneratorTarget* target,
cmOutputConverter::RelativeRoot relative);
---
Summary of changes:
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.6.1-1539-g4812110
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 4812110823f42f84573a23c87459afa91349995f (commit)
via dc0edf29b65c50d25da84ecca0c48131f5da69c0 (commit)
from 978941f83ab3e4bd80ac52100a13c68a85bb8ce0 (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=4812110823f42f84573a23c87459afa91349995f
commit 4812110823f42f84573a23c87459afa91349995f
Merge: 978941f dc0edf2
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:14:16 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:14:16 2016 -0400
Merge topic 'cleanup-Convert' into next
dc0edf29 Fixup commit
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc0edf29b65c50d25da84ecca0c48131f5da69c0
commit dc0edf29b65c50d25da84ecca0c48131f5da69c0
Author: Stephen Kelly
AuthorDate: Sat Aug 27 15:12:41 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:13:56 2016 +0200
Fixup commit
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index cb82d0a..085cc91 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -982,7 +982,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
: cmOutputConverter::NONE);
std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
if (shellCommand.empty()) {
-shellCommand = this->Convert(cmd, cmOutputConverter::NONE);
+shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
cmOutputConverter::SHELL);
}
cmd = launcher + shellCommand;
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx |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.6.1-1537-g978941f
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 978941f83ab3e4bd80ac52100a13c68a85bb8ce0 (commit)
via 99483b9f9828e459e3e7887cea02d82aae887866 (commit)
from 677090f0749b78f9cc44e33c7a77c6eda977be0f (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=978941f83ab3e4bd80ac52100a13c68a85bb8ce0
commit 978941f83ab3e4bd80ac52100a13c68a85bb8ce0
Merge: 677090f 99483b9
Author: Stephen Kelly
AuthorDate: Sat Aug 27 09:13:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 09:13:44 2016 -0400
Merge topic 'cleanup-Convert' into next
99483b9f Revert "Makefiles: Remove uselss uses of Convert"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99483b9f9828e459e3e7887cea02d82aae887866
commit 99483b9f9828e459e3e7887cea02d82aae887866
Author: Stephen Kelly
AuthorDate: Sat Aug 27 15:13:29 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 15:13:29 2016 +0200
Revert "Makefiles: Remove uselss uses of Convert"
This reverts commit ad4b7e05980bd53686fd48ba341c954985ad3056.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index b3d601a..cb82d0a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -835,7 +835,8 @@ std::string
cmLocalUnixMakefileGenerator3::GetRelativeTargetDirectory(
{
std::string dir = this->HomeRelativeOutputPath;
dir += this->GetTargetDirectory(target);
- return dir;
+ return this->Convert(dir, cmOutputConverter::NONE,
+ cmOutputConverter::UNCHANGED);
}
void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
@@ -981,7 +982,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
: cmOutputConverter::NONE);
std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
if (shellCommand.empty()) {
-shellCommand = cmd;
+shellCommand = this->Convert(cmd, cmOutputConverter::NONE);
}
cmd = launcher + shellCommand;
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx |5 +++--
1 file changed, 3 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.6.1-1535-g677090f
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 677090f0749b78f9cc44e33c7a77c6eda977be0f (commit)
via ad4b7e05980bd53686fd48ba341c954985ad3056 (commit)
from 2b114c41b54c4d14745b2b98c57ccc7c92111f7e (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=677090f0749b78f9cc44e33c7a77c6eda977be0f
commit 677090f0749b78f9cc44e33c7a77c6eda977be0f
Merge: 2b114c4 ad4b7e0
Author: Stephen Kelly
AuthorDate: Sat Aug 27 08:47:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 08:47:44 2016 -0400
Merge topic 'cleanup-Convert' into next
ad4b7e05 Makefiles: Remove uselss uses of Convert
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad4b7e05980bd53686fd48ba341c954985ad3056
commit ad4b7e05980bd53686fd48ba341c954985ad3056
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:53 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 14:47:13 2016 +0200
Makefiles: Remove uselss uses of Convert
Convert with NONE and UNCHANGED is a no-op.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index cb82d0a..b3d601a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -835,8 +835,7 @@ std::string
cmLocalUnixMakefileGenerator3::GetRelativeTargetDirectory(
{
std::string dir = this->HomeRelativeOutputPath;
dir += this->GetTargetDirectory(target);
- return this->Convert(dir, cmOutputConverter::NONE,
- cmOutputConverter::UNCHANGED);
+ return dir;
}
void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
@@ -982,7 +981,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
: cmOutputConverter::NONE);
std::string shellCommand = this->MaybeConvertWacomShellCommand(cmd);
if (shellCommand.empty()) {
-shellCommand = this->Convert(cmd, cmOutputConverter::NONE);
+shellCommand = cmd;
}
cmd = launcher + shellCommand;
---
Summary of changes:
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.6.1-1533-g2b114c4
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 2b114c41b54c4d14745b2b98c57ccc7c92111f7e (commit) via 1fc076d1fe196d2112da45a6aced04ca39594401 (commit) from 738e3e9d9af191e7f118e182bb3ba3690430e2af (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=2b114c41b54c4d14745b2b98c57ccc7c92111f7e commit 2b114c41b54c4d14745b2b98c57ccc7c92111f7e Merge: 738e3e9 1fc076d Author: Stephen Kelly AuthorDate: Sat Aug 27 08:46:13 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Aug 27 08:46:13 2016 -0400 Merge topic 'cleanup-Convert' into next 1fc076d1 Revert part of branch https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fc076d1fe196d2112da45a6aced04ca39594401 commit 1fc076d1fe196d2112da45a6aced04ca39594401 Author: Stephen Kelly AuthorDate: Sat Aug 27 14:45:29 2016 +0200 Commit: Stephen Kelly CommitDate: Sat Aug 27 14:45:45 2016 +0200 Revert part of branch diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h index b433c18..d3f9d64 100644 --- a/Source/cmCommonTargetGenerator.h +++ b/Source/cmCommonTargetGenerator.h @@ -57,9 +57,9 @@ protected: // The windows module definition source file (.def), if any. cmSourceFile const* ModuleDefinitionFile; - std::string Convert(std::string const& source, - cmOutputConverter::RelativeRoot relative, - cmOutputConverter::OutputFormat output); + std::string Convert( +std::string const& source, cmOutputConverter::RelativeRoot relative, +cmOutputConverter::OutputFormat output = cmOutputConverter::UNCHANGED); void AppendFortranFormatFlags(std::string& flags, cmSourceFile const& source); diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 928f7ec..18e123e 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -238,8 +238,8 @@ bool cmDependsC::WriteDependencies(const std::set& sources, // written by the original local generator for this directory // convert the dependencies to paths relative to the home output // directory. We must do the same here. - std::string obj_i = this->LocalGenerator->ConvertToRelativePath( -obj, cmOutputConverter::HOME_OUTPUT); + std::string obj_i = +this->LocalGenerator->Convert(obj, cmOutputConverter::HOME_OUTPUT); std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( obj_i, cmOutputConverter::MAKERULE); internalDepends << obj_i << std::endl; diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 8c0acce..c57b558 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -193,15 +193,15 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends, stamp += ".mod.stamp"; fcStream << "\n"; fcStream << " \"" - << this->LocalGenerator->ConvertToRelativePath( + << this->LocalGenerator->Convert( mod_lower, cmOutputConverter::START_OUTPUT) << "\"\n"; fcStream << " \"" - << this->LocalGenerator->ConvertToRelativePath( + << this->LocalGenerator->Convert( mod_upper, cmOutputConverter::START_OUTPUT) << "\"\n"; fcStream << " \"" - << this->LocalGenerator->ConvertToRelativePath( + << this->LocalGenerator->Convert( stamp, cmOutputConverter::START_OUTPUT) << "\"\n"; } @@ -317,8 +317,8 @@ bool cmDependsFortran::WriteDependenciesReal(const char* obj, const char* src = info.Source.c_str(); // Write the include dependencies to the output stream. - std::string obj_i = this->LocalGenerator->ConvertToRelativePath( -obj, cmOutputConverter::HOME_OUTPUT); + std::string obj_i = +this->LocalGenerator->Convert(obj, cmOutputConverter::HOME_OUTPUT); std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( obj_i, cmOutputConverter::MAKERULE); internalDepends << obj_i << std::endl; diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 945ee40..e617b08 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -904,8 +904,8 @@ void
[Cmake-commits] CMake branch, next, updated. v3.6.1-1531-g738e3e9
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 738e3e9d9af191e7f118e182bb3ba3690430e2af (commit)
via 6ad153786f119e994662c2ec05059cdf46d9dbad (commit)
via a11a408a6edcb956fe9ba7a141cfbfd8e94078d6 (commit)
via bfa30fa10056b0ee07a58b7d09bc87617fbb7cd2 (commit)
via 12520e0f723916bb803946d6ba6f5f929bba0120 (commit)
via f9d90d054510548490d0a7555b186201ae9f1a45 (commit)
via f57933cac8dfd8d4c64d970b1991c263154b0a82 (commit)
via bed34f1bd81edd04d55a46cf43658b8339aac1de (commit)
via 861e2da31d76947b8358930c9f43eed0aa15b642 (commit)
via bb1985c5408ac6c130c3f94197fcd987b7e7edc2 (commit)
via 8c020fc541e6a00736c9897f791e1a3ea76ef0d6 (commit)
via e3da80d92561e8a5fdc65fb0a5db18e09cf9ef1e (commit)
via fe916d26c37622ee0c6198385dcf86ea7fb545dc (commit)
via e7c62e41461995c3ad73be65cb7a9f63e77081b9 (commit)
via fcb3a56802c4bf8757424375baf3c4fe053aafbd (commit)
via 9a296bc30b860e3360fbc4b7adaa1113461a1c89 (commit)
via e99e08cc167535daf324d81d510ca8f818ce924c (commit)
via ca4bddc08179c8c9c1585f1949bbc840869c1d9f (commit)
via 064724040af65c7edc985877b637560620136565 (commit)
via be096139cf7380f89d8aaad3ea283559b27b2614 (commit)
via cd351ef2c427284eea0ab494eba5d4f24bc0e050 (commit)
via fbd83948675f4b1cb487d59390cfe1689f801fc0 (commit)
via c341f4679ad00cb65c7660b474ddabd13d0ef498 (commit)
via 6960516b6b053816313d2ff5ee4e9375a84829cb (commit)
via e0fd2d0446101847dd40cfe4cc451667d04ddcd9 (commit)
via ad70a236f4368c21c08bcd4ea4d28425176c4e17 (commit)
via e3ca17e13b8d2aecc6d97ac800d65c6c35378a98 (commit)
via 0bbdbd95c9515a4714ef1d57a17c7271bc4d1774 (commit)
via 9440d5776bf48778d452e2d3a48d4e93d7b6f7a7 (commit)
from 61cdf5d4af56e5e5f7d30448828cc7a35a8ae4a7 (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=738e3e9d9af191e7f118e182bb3ba3690430e2af
commit 738e3e9d9af191e7f118e182bb3ba3690430e2af
Merge: 61cdf5d 6ad1537
Author: Stephen Kelly
AuthorDate: Sat Aug 27 07:45:30 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sat Aug 27 07:45:30 2016 -0400
Merge topic 'cleanup-Convert' into next
6ad15378 Convert: Make variables a bit more clear
a11a408a Convert: Remove UNCHANGED enum value
bfa30fa1 Convert: Remove 'FULL' conversion
12520e0f Convert: Replace Convert(FULL) with equivalent
f9d90d05 Ninja: Replace ternary with if()
f57933ca Convert: Replace trivial conversion with new method
bed34f1b Convert: Replace UNCHANGED conversions with new API call
861e2da3 Convert: Extract ConvertToRelativePath from Convert()
bb1985c5 Convert: Replace FULL conversions with equivalent
8c020fc5 VS: Replace FULL/UNCHANGED conversion with equivalent
e3da80d9 Convert: Remove NONE conversion
fe916d26 Convert: Replace uses of Convert(NONE)
e7c62e41 VS: Replace variable with an if()
fcb3a568 Makefiles: Replace ternaries with if()s
9a296bc3 Makefiles: Inline MakeLauncher into only caller
e99e08cc Makefiles: Simplify MakeLauncher return value
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad153786f119e994662c2ec05059cdf46d9dbad
commit 6ad153786f119e994662c2ec05059cdf46d9dbad
Author: Stephen Kelly
AuthorDate: Sat Aug 27 13:44:58 2016 +0200
Commit: Stephen Kelly
CommitDate: Sat Aug 27 13:44:58 2016 +0200
Convert: Make variables a bit more clear
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index f056a1b..630da42 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -49,26 +49,26 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
std::string cmOutputConverter::ConvertToRelativePath(
const std::string& source, RelativeRoot relative) const
{
- std::string result = source;
+ std::string result;
switch (relative) {
case HOME:
result = this->ConvertToRelativePath(
-this->GetState()->GetSourceDirectoryComponents(), result);
+this->GetState()->GetSourceDirectoryComponents(), source);
break;
case START:
result = this->ConvertToRelativePath(
this->StateSnapshot.GetDirectory().GetCurrentSourceComponents(),
-result);
+source);
break;
case HOME_OUTPUT:
result = this->ConvertToRelativePath(
-this->GetState()->GetBinaryDirectoryComponents(), result);
+this->GetState()->GetBinaryDirectoryComp
[Cmake-commits] CMake branch, next, updated. v3.6.1-1417-gd644883
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 d64488359696c8ad9519daff699ac9f1d93b2b4f (commit) via d0c8e915ef09b5596befa7b7b05e2b1ae189141d (commit) from a03507820e8b11bc65bd678433c173b92b3549f6 (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=d64488359696c8ad9519daff699ac9f1d93b2b4f commit d64488359696c8ad9519daff699ac9f1d93b2b4f Merge: a035078 d0c8e91 Author: Stephen Kelly AuthorDate: Wed Aug 24 16:11:17 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Aug 24 16:11:17 2016 -0400 Merge topic 'extract-cmMessenger' into next d0c8e915 fixup! cmMessenger: Extract from cmake class https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c8e915ef09b5596befa7b7b05e2b1ae189141d commit d0c8e915ef09b5596befa7b7b05e2b1ae189141d Author: Stephen Kelly AuthorDate: Wed Aug 24 22:07:44 2016 +0200 Commit: Stephen Kelly CommitDate: Wed Aug 24 22:07:44 2016 +0200 fixup! cmMessenger: Extract from cmake class diff --git a/bootstrap b/bootstrap index 742fa2b..6c6713e 100755 --- a/bootstrap +++ b/bootstrap @@ -266,6 +266,7 @@ CMAKE_CXX_SOURCES="\ cmPropertyDefinition \ cmPropertyDefinitionMap \ cmMakefile \ + cmMessenger \ cmExportBuildFileGenerator \ cmExportFileGenerator \ cmExportInstallFileGenerator \ --- Summary of changes: bootstrap |1 + 1 file changed, 1 insertion(+) 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.6.1-1411-g873ec69
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 873ec699047784aa9072e8fb471aa597e573d084 (commit)
via 1c66f23abbcf9c9cef4b72e601893336553bc186 (commit)
via 29332a3ba6593ebc2406ffda9cbf6c9e3d33a875 (commit)
via 2d315d2f59e3bbd4544cc33b718750f1f3a6cea5 (commit)
via c37d2ef32fff9f9d991ef78905ed2097718489c1 (commit)
via 850a4ae4abbb5d5a61862bd26bdc1e9ecdb3a6e6 (commit)
via db7de303c2a1e35b672016833db4bf85148c98c2 (commit)
from 075c74e6b33c65d0c63fc35010c211a4caab (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=873ec699047784aa9072e8fb471aa597e573d084
commit 873ec699047784aa9072e8fb471aa597e573d084
Merge: 075c74e 1c66f23
Author: Stephen Kelly
AuthorDate: Wed Aug 24 15:20:09 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 24 15:20:09 2016 -0400
Merge topic 'extract-cmMessenger' into next
1c66f23a Parser: Port away from cmMakefile
29332a3b cmMessenger: Extract from cmake class
2d315d2f cmMakefile: Port nested error logic away from cmExecutionStatus
c37d2ef3 cmMakefile: Simplify IssueMessage implementation
850a4ae4 Parser: Issue messages through cmake, not cmSystemTools
db7de303 Parser: Store the Backtrace for use in issuing messages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c66f23abbcf9c9cef4b72e601893336553bc186
commit 1c66f23abbcf9c9cef4b72e601893336553bc186
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:28 2016 +0100
Commit: Stephen Kelly
CommitDate: Wed Aug 24 20:37:32 2016 +0200
Parser: Port away from cmMakefile
It is an unneeded dependency.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 9204d14..39d9e97 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -12,7 +12,7 @@
#include "cmListFileCache.h"
#include "cmListFileLexer.h"
-#include "cmMakefile.h"
+#include "cmMessenger.h"
#include "cmOutputConverter.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
@@ -21,7 +21,8 @@
struct cmListFileParser
{
- cmListFileParser(cmListFile* lf, cmMakefile* mf, const char* filename);
+ cmListFileParser(cmListFile* lf, cmListFileBacktrace lfbt,
+ cmMessenger* messenger, const char* filename);
~cmListFileParser();
void IssueFileOpenError(std::string const& text) const;
void IssueError(std::string const& text) const;
@@ -30,8 +31,8 @@ struct cmListFileParser
bool AddArgument(cmListFileLexer_Token* token,
cmListFileArgument::Delimiter delim);
cmListFile* ListFile;
- cmMakefile* Makefile;
cmListFileBacktrace Backtrace;
+ cmMessenger* Messenger;
const char* FileName;
cmListFileLexer* Lexer;
cmListFileFunction Function;
@@ -43,11 +44,12 @@ struct cmListFileParser
} Separation;
};
-cmListFileParser::cmListFileParser(cmListFile* lf, cmMakefile* mf,
+cmListFileParser::cmListFileParser(cmListFile* lf, cmListFileBacktrace lfbt,
+ cmMessenger* messenger,
const char* filename)
: ListFile(lf)
- , Makefile(mf)
- , Backtrace(mf->GetBacktrace())
+ , Backtrace(lfbt)
+ , Messenger(messenger)
, FileName(filename)
, Lexer(cmListFileLexer_New())
{
@@ -60,7 +62,7 @@ cmListFileParser::~cmListFileParser()
void cmListFileParser::IssueFileOpenError(const std::string& text) const
{
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, text);
+ this->Messenger->IssueMessage(cmake::FATAL_ERROR, text, this->Backtrace);
}
void cmListFileParser::IssueError(const std::string& text) const
@@ -70,8 +72,7 @@ void cmListFileParser::IssueError(const std::string& text)
const
lfc.Line = cmListFileLexer_GetCurrentLine(this->Lexer);
cmListFileBacktrace lfbt = this->Backtrace;
lfbt = lfbt.Push(lfc);
- this->Makefile->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, text,
- lfbt);
+ this->Messenger->IssueMessage(cmake::FATAL_ERROR, text, lfbt);
cmSystemTools::SetFatalErrorOccured();
}
@@ -129,7 +130,8 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMessenger* messenger,
+ cmListFileBacktrace const& lfbt)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -1
[Cmake-commits] CMake branch, next, updated. v3.6.1-1313-g41b3c6b
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 41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b (commit)
via d10f2d8b29f54388f74beaaf4a56275d881f5b85 (commit)
via 6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9 (commit)
from cdf7e5800504307b820f742fc3944391d6e37292 (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=41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b
commit 41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b
Merge: cdf7e58 d10f2d8
Author: Stephen Kelly
AuthorDate: Mon Aug 22 17:55:49 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Aug 22 17:55:49 2016 -0400
Merge topic 'version-cleanups' into next
d10f2d8b Version: Remove check for existence of CVS repository
6a1e4d67 Version: Use cmakedefine01 for boolean
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d10f2d8b29f54388f74beaaf4a56275d881f5b85
commit d10f2d8b29f54388f74beaaf4a56275d881f5b85
Author: Stephen Kelly
AuthorDate: Mon Aug 22 23:46:01 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Aug 22 23:54:46 2016 +0200
Version: Remove check for existence of CVS repository
diff --git a/Source/CMakeVersionSource.cmake b/Source/CMakeVersionSource.cmake
index bc5975e..4f22ded 100644
--- a/Source/CMakeVersionSource.cmake
+++ b/Source/CMakeVersionSource.cmake
@@ -29,11 +29,4 @@ if(EXISTS ${CMake_SOURCE_DIR}/.git/HEAD)
endif()
endif()
endif()
-elseif(EXISTS ${CMake_SOURCE_DIR}/CVS/Repository)
- file(READ ${CMake_SOURCE_DIR}/CVS/Repository repo)
- set(branch "")
- if("${repo}" MATCHES "\\.git/([^\r\n]*)")
-set(branch "${CMAKE_MATCH_1}")
- endif()
- set(CMake_VERSION_SOURCE "cvs${branch}")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9
commit 6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9
Author: Stephen Kelly
AuthorDate: Wed Jul 27 00:07:32 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Aug 22 23:52:14 2016 +0200
Version: Use cmakedefine01 for boolean
The CMake_VERSION_IS_DIRTY CMake variable is not set by
CMakeVersionCompute or its delegate if not building from git, or if the
git executable is not found.
That means that cmVersionConfig.h would be generated to contain an empty
C++ define for CMake_VERSION_IS_DIRTY.
cmake::ReportCapabilities() requires the preprocessor define to have a
value, so use the standard construct for booleans of cmakedefine01.
diff --git a/Source/cmVersionConfig.h.in b/Source/cmVersionConfig.h.in
index 92abfbe..ab3c1af 100644
--- a/Source/cmVersionConfig.h.in
+++ b/Source/cmVersionConfig.h.in
@@ -13,5 +13,5 @@
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
#define CMake_VERSION_SUFFIX "@CMake_VERSION_SUFFIX@"
-#define CMake_VERSION_IS_DIRTY @CMake_VERSION_IS_DIRTY@
+#cmakedefine01 CMake_VERSION_IS_DIRTY
#define CMake_VERSION "@CMake_VERSION@"
---
Summary of changes:
Source/CMakeVersionSource.cmake |7 ---
Source/cmVersionConfig.h.in |2 +-
2 files changed, 1 insertion(+), 8 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.6.0-rc1-308-g3e90ac3
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 3e90ac3243394441001e232620e31850d1d25865 (commit)
via 5bbcf758a1a0c52836d313156788a10a232f1f9f (commit)
via 262ce91e8ac3c6fc9b09605e652028db7229b9b8 (commit)
from ce3b106ac2c149d1d4653dc1d417b261101acdea (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=3e90ac3243394441001e232620e31850d1d25865
commit 3e90ac3243394441001e232620e31850d1d25865
Merge: ce3b106 5bbcf75
Author: Stephen Kelly
AuthorDate: Mon Jun 13 14:32:08 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Jun 13 14:32:08 2016 -0400
Merge topic 'clean-up-cmMakefile-IssueMessage' into next
5bbcf758 cmIfCommand: Don't rely on NestedError logic to issue messages
262ce91e cmMakefile: Extract invoke result variables
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bbcf758a1a0c52836d313156788a10a232f1f9f
commit 5bbcf758a1a0c52836d313156788a10a232f1f9f
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:29 2016 +0100
Commit: Stephen Kelly
CommitDate: Mon Jun 13 20:20:44 2016 +0200
cmIfCommand: Don't rely on NestedError logic to issue messages
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 45395d1..cb5ba76 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -185,12 +185,12 @@ bool cmIfCommand::InvokeInitialPass(
conditionEvaluator.IsTrue(expandedArguments, errorString, status);
if (!errorString.empty()) {
-std::string err = cmIfCommandError(expandedArguments);
+std::string err = "if " + cmIfCommandError(expandedArguments);
err += errorString;
if (status == cmake::FATAL_ERROR) {
- this->SetError(err);
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, err);
cmSystemTools::SetFatalErrorOccured();
- return false;
+ return true;
} else {
this->Makefile->IssueMessage(status, err);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=262ce91e8ac3c6fc9b09605e652028db7229b9b8
commit 262ce91e8ac3c6fc9b09605e652028db7229b9b8
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:28 2016 +0100
Commit: Stephen Kelly
CommitDate: Mon Jun 13 20:20:44 2016 +0200
cmMakefile: Extract invoke result variables
Make it more clear what is happening here.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c9192fd..bfcd7db 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -254,9 +254,10 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction&
lff,
this->PrintCommandTrace(lff);
}
// Try invoking the command.
- if (!pcmd->InvokeInitialPass(lff.Arguments, status) ||
- status.GetNestedError()) {
-if (!status.GetNestedError()) {
+ bool invokeSucceeded = pcmd->InvokeInitialPass(lff.Arguments, status);
+ bool hadNestedError = status.GetNestedError();
+ if (!invokeSucceeded || hadNestedError) {
+if (!hadNestedError) {
// The command invocation requested that we report an error.
this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
}
---
Summary of changes:
Source/cmIfCommand.cxx |6 +++---
Source/cmMakefile.cxx |7 ---
2 files changed, 7 insertions(+), 6 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.6.0-rc1-305-gce3b106
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 ce3b106ac2c149d1d4653dc1d417b261101acdea (commit)
via 905e738ffeb1ec1b5d1a376b99e300a8787f7255 (commit)
via 0a9094cd1017057d3c5141fdacdc6a89fb14acfc (commit)
from 18a882ebb3cd24618530eef4793a882babd9 (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=ce3b106ac2c149d1d4653dc1d417b261101acdea
commit ce3b106ac2c149d1d4653dc1d417b261101acdea
Merge: 18a 905e738
Author: Stephen Kelly
AuthorDate: Mon Jun 13 14:19:53 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Jun 13 14:19:53 2016 -0400
Merge topic 'clean-up-Parser' into next
905e738f Parser: Out-of-line conditional code to cmMakefile
0a9094cd Parser: Issue file open error messages through dedicated API
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=905e738ffeb1ec1b5d1a376b99e300a8787f7255
commit 905e738ffeb1ec1b5d1a376b99e300a8787f7255
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:26 2016 +0100
Commit: Stephen Kelly
CommitDate: Mon Jun 13 20:19:16 2016 +0200
Parser: Out-of-line conditional code to cmMakefile
Simplify parser API.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 4df542f..4460418 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -118,7 +118,7 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -132,76 +132,6 @@ bool cmListFile::ParseFile(const char* filename, bool
topLevel, cmMakefile* mf)
parseError = !parser.ParseFile();
}
- // do we need a cmake_policy(VERSION call?
- if (topLevel) {
-bool hasVersion = false;
-// search for the right policy command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required") {
-hasVersion = true;
-break;
- }
-}
-// if no policy command is found this is an error if they use any
-// non advanced functions or a lot of functions
-if (!hasVersion) {
- bool isProblem = true;
- if (this->Functions.size() < 30) {
-// the list of simple commands DO NOT ADD TO THIS LIST!
-// these commands must have backwards compatibility forever and
-// and that is a lot longer than your tiny mind can comprehend mortal
-std::set allowedCommands;
-allowedCommands.insert("project");
-allowedCommands.insert("set");
-allowedCommands.insert("if");
-allowedCommands.insert("endif");
-allowedCommands.insert("else");
-allowedCommands.insert("elseif");
-allowedCommands.insert("add_executable");
-allowedCommands.insert("add_library");
-allowedCommands.insert("target_link_libraries");
-allowedCommands.insert("option");
-allowedCommands.insert("message");
-isProblem = false;
-for (std::vector::iterator i =
- this->Functions.begin();
- i != this->Functions.end(); ++i) {
- std::string name = cmSystemTools::LowerCase(i->Name);
- if (allowedCommands.find(name) == allowedCommands.end()) {
-isProblem = true;
-break;
- }
-}
- }
-
- if (isProblem) {
-// Tell the top level cmMakefile to diagnose
-// this violation of CMP.
-mf->SetCheckCMP(true);
-
-// Implicitly set the version for the user.
-mf->SetPolicyVersion("2.4");
- }
-}
-bool hasProject = false;
-// search for a project command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "project") {
-hasProject = true;
-break;
- }
-}
-// if no project command is found, add one
-if (!hasProject) {
- cmListFileFunction project;
- project.Name = "PROJECT";
- cmListFileArgument prj("Project", cmListFileArgument::Unquoted, 0);
- project.Arguments.push_back(prj);
- this->Functions.insert(this->Functions.
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-302-g18a6666
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 18a882ebb3cd24618530eef4793a882babd9 (commit)
via 613d87392f7ee2d11165adc3aae96c6f4597d4c6 (commit)
from 8bdf697d2c9811c61ee9727648c61692089a08c7 (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=18a882ebb3cd24618530eef4793a882babd9
commit 18a882ebb3cd24618530eef4793a882babd9
Merge: 8bdf697 613d873
Author: Stephen Kelly
AuthorDate: Mon Jun 13 14:08:59 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Jun 13 14:08:59 2016 -0400
Merge topic 'clean-up-Parser' into next
613d8739 Revert "Revert branch"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=613d87392f7ee2d11165adc3aae96c6f4597d4c6
commit 613d87392f7ee2d11165adc3aae96c6f4597d4c6
Author: Stephen Kelly
AuthorDate: Mon Jun 13 20:06:48 2016 +0200
Commit: Stephen Kelly
CommitDate: Mon Jun 13 20:06:55 2016 +0200
Revert "Revert branch"
This reverts commit c8a95d24aaa25856c1131488ade8fbb662bb09f2.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 5e512e2..036a2b1 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -23,15 +23,12 @@ struct cmListFileParser
{
cmListFileParser(cmListFile* lf, cmMakefile* mf, const char* filename);
~cmListFileParser();
- void IssueError(std::string const& text);
- void IssueFileOpenError(std::string const& text) const;
bool ParseFile();
bool ParseFunction(const char* name, long line);
bool AddArgument(cmListFileLexer_Token* token,
cmListFileArgument::Delimiter delim);
cmListFile* ListFile;
cmMakefile* Makefile;
- cmListFileBacktrace Backtrace;
const char* FileName;
cmListFileLexer* Lexer;
cmListFileFunction Function;
@@ -47,7 +44,6 @@ cmListFileParser::cmListFileParser(cmListFile* lf,
cmMakefile* mf,
const char* filename)
: ListFile(lf)
, Makefile(mf)
- , Backtrace(mf->GetBacktrace())
, FileName(filename)
, Lexer(cmListFileLexer_New())
{
@@ -58,37 +54,23 @@ cmListFileParser::~cmListFileParser()
cmListFileLexer_Delete(this->Lexer);
}
-void cmListFileParser::IssueFileOpenError(const std::string& text) const
-{
- this->Makefile->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, text,
- this->Backtrace);
-}
-
-void cmListFileParser::IssueError(const std::string& text)
-{
- cmListFileContext lfc;
- lfc.FilePath = this->FileName;
- lfc.Line = cmListFileLexer_GetCurrentLine(this->Lexer);
- cmListFileBacktrace lfbt = this->Backtrace.Pop();
- lfbt = lfbt.Push(lfc);
- this->Makefile->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, text,
- lfbt);
-}
-
bool cmListFileParser::ParseFile()
{
// Open the file.
cmListFileLexer_BOM bom;
if (!cmListFileLexer_SetFileName(this->Lexer, this->FileName, &bom)) {
-this->IssueFileOpenError("cmListFileCache: error can not open file.");
+cmSystemTools::Error("cmListFileCache: error can not open file ",
+ this->FileName);
return false;
}
// Verify the Byte-Order-Mark, if any.
if (bom != cmListFileLexer_BOM_None && bom != cmListFileLexer_BOM_UTF8) {
cmListFileLexer_SetFileName(this->Lexer, 0, 0);
-this->IssueFileOpenError(
- "File starts with a Byte-Order-Mark that is not UTF-8.");
+std::ostringstream m;
+m << "File\n " << this->FileName << "\n"
+ << "starts with a Byte-Order-Mark that is not UTF-8.";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, m.str());
return false;
}
@@ -111,25 +93,29 @@ bool cmListFileParser::ParseFile()
}
} else {
std::ostringstream error;
-error << "Parse error. Expected a newline, got "
+error << "Error in cmake code at\n"
+ << this->FileName << ":" << token->line << ":\n"
+ << "Parse error. Expected a newline, got "
<< cmListFileLexer_GetTypeAsString(this->Lexer, token->type)
<< " with text \"" << token->text << "\".";
-this->IssueError(error.str());
+cmSystemTools::Error(error.str().c_str());
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-264-g63bc1a8
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 63bc1a824aa06ec90bde12603d6bfaa612a80462 (commit)
via 23f87e8157770c56d3aa568f3d1318f9b9070364 (commit)
via 54c65d5fb22c3cc53ecd707687c2f25b1643726b (commit)
from b70f00924338bd5efe4144076bd7994223ef3195 (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=63bc1a824aa06ec90bde12603d6bfaa612a80462
commit 63bc1a824aa06ec90bde12603d6bfaa612a80462
Merge: b70f009 23f87e8
Author: Stephen Kelly
AuthorDate: Sun Jun 12 16:09:50 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 16:09:50 2016 -0400
Merge topic 'fix-cmake-ISP-violation' into next
23f87e81 cmake: Remove force from IssueMessage API
54c65d5f cmake: Extract DisplayMessage API.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23f87e8157770c56d3aa568f3d1318f9b9070364
commit 23f87e8157770c56d3aa568f3d1318f9b9070364
Author: Stephen Kelly
AuthorDate: Thu Jun 9 09:57:47 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Jun 12 22:09:27 2016 +0200
cmake: Remove force from IssueMessage API
The force parameter is ugly and makes the method harder to reason about
(issues the message ... but maybe it doesn't ... but then again you can
force it). It is a violation of
https://en.wikipedia.org/wiki/Interface_segregation_principle
and is the kind of thing described in a recent blog here:
http://code.joejag.com/2016/anti-if-the-missing-patterns.html
"Any time you see this you actually have two methods bundled into one.
That boolean represents an opportunity to name a concept in your code."
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ca30b3d..00ff5ac 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -105,8 +105,8 @@ cmMakefile::~cmMakefile()
cmDeleteAll(this->EvaluationFiles);
}
-void cmMakefile::IssueMessage(cmake::MessageType t, std::string const& text,
- bool force) const
+void cmMakefile::IssueMessage(cmake::MessageType t,
+ std::string const& text) const
{
// Collect context information.
if (!this->ExecutionStatusStack.empty()) {
@@ -114,7 +114,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
std::string const& text,
this->ExecutionStatusStack.back()->SetNestedError(true);
}
}
- this->GetCMakeInstance()->IssueMessage(t, text, this->GetBacktrace(), force);
+ this->GetCMakeInstance()->IssueMessage(t, text, this->GetBacktrace());
}
cmStringRange cmMakefile::GetIncludeDirectoriesEntries() const
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c665b1f..719c764 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -715,8 +715,7 @@ public:
cmMakefile* Makefile;
};
- void IssueMessage(cmake::MessageType t, std::string const& text,
-bool force = false) const;
+ void IssueMessage(cmake::MessageType t, std::string const& text) const;
/** Set whether or not to report a CMP violation. */
void SetCheckCMP(bool b) { this->CheckCMP = b; }
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index f4458a7..689e3fa 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -63,8 +63,9 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
std::string message = cmJoin(cmMakeRange(i, args.end()), std::string());
if (type != cmake::MESSAGE) {
-// we've overriden the message type, above, so force IssueMessage to use it
-this->Makefile->IssueMessage(type, message, true);
+// we've overriden the message type, above, so display it directly
+cmake* cm = this->Makefile->GetCMakeInstance();
+cm->DisplayMessage(type, message, this->Makefile->GetBacktrace());
} else {
if (status) {
this->Makefile->DisplayStatus(message.c_str(), -1);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 657091b..594eebf 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2294,16 +2294,14 @@ void displayMessage(cmake::MessageType t,
std::ostringstream& msg)
}
void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
- cmListFileBacktrace const& backtrace,
- bool force) const
-{
- if (!force) {
-// override the message type, if needed, for warnings and errors
-cmake::MessageType override = this->ConvertMessageType(t);
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-261-gb70f009
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 b70f00924338bd5efe4144076bd7994223ef3195 (commit)
via 8e5e6692033451fedac9241d05000b781059bf58 (commit)
via d8979d1d9c3ac37b3879e2983c1b04f1866fb9c9 (commit)
via 4c87011e0c4139fa8bc51a81249c39e94b7179f3 (commit)
via 2876335d95c5f9c16d14979041754b8ae70d7e42 (commit)
from 2a0c400fafb2a45a452e249a134fe3ffc9bb92d8 (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=b70f00924338bd5efe4144076bd7994223ef3195
commit b70f00924338bd5efe4144076bd7994223ef3195
Merge: 2a0c400 8e5e669
Author: Stephen Kelly
AuthorDate: Sun Jun 12 15:57:58 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 15:57:58 2016 -0400
Merge topic 'clean-up-Parser' into next
8e5e6692 Parser: Out-of-line conditional code to cmMakefile
d8979d1d Parser: Issue file open error messages through dedicated API
4c87011e Parser: Issue messages through cmake, not cmSystemTools
2876335d Parser: Store the Backtrace for use in issuing messages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e5e6692033451fedac9241d05000b781059bf58
commit 8e5e6692033451fedac9241d05000b781059bf58
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:26 2016 +0100
Commit: Stephen Kelly
CommitDate: Sun Jun 12 21:57:47 2016 +0200
Parser: Out-of-line conditional code to cmMakefile
Simplify parser API.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 4a4903e..5e512e2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -129,7 +129,7 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -143,76 +143,6 @@ bool cmListFile::ParseFile(const char* filename, bool
topLevel, cmMakefile* mf)
parseError = !parser.ParseFile();
}
- // do we need a cmake_policy(VERSION call?
- if (topLevel) {
-bool hasVersion = false;
-// search for the right policy command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required") {
-hasVersion = true;
-break;
- }
-}
-// if no policy command is found this is an error if they use any
-// non advanced functions or a lot of functions
-if (!hasVersion) {
- bool isProblem = true;
- if (this->Functions.size() < 30) {
-// the list of simple commands DO NOT ADD TO THIS LIST!
-// these commands must have backwards compatibility forever and
-// and that is a lot longer than your tiny mind can comprehend mortal
-std::set allowedCommands;
-allowedCommands.insert("project");
-allowedCommands.insert("set");
-allowedCommands.insert("if");
-allowedCommands.insert("endif");
-allowedCommands.insert("else");
-allowedCommands.insert("elseif");
-allowedCommands.insert("add_executable");
-allowedCommands.insert("add_library");
-allowedCommands.insert("target_link_libraries");
-allowedCommands.insert("option");
-allowedCommands.insert("message");
-isProblem = false;
-for (std::vector::iterator i =
- this->Functions.begin();
- i != this->Functions.end(); ++i) {
- std::string name = cmSystemTools::LowerCase(i->Name);
- if (allowedCommands.find(name) == allowedCommands.end()) {
-isProblem = true;
-break;
- }
-}
- }
-
- if (isProblem) {
-// Tell the top level cmMakefile to diagnose
-// this violation of CMP.
-mf->SetCheckCMP(true);
-
-// Implicitly set the version for the user.
-mf->SetPolicyVersion("2.4");
- }
-}
-bool hasProject = false;
-// search for a project command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "project") {
-hasProject = true;
-break;
- }
-}
-// if no project command is found, add one
-if (!hasProject
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-256-g2a0c400
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 2a0c400fafb2a45a452e249a134fe3ffc9bb92d8 (commit)
via 7b4b6e82de18ab6fc8156f047f900b57fd3c4fff (commit)
from f3a1b9ac463d290948700ae3e2ebf8a74cb31d44 (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=2a0c400fafb2a45a452e249a134fe3ffc9bb92d8
commit 2a0c400fafb2a45a452e249a134fe3ffc9bb92d8
Merge: f3a1b9a 7b4b6e8
Author: Stephen Kelly
AuthorDate: Sun Jun 12 15:57:28 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 15:57:28 2016 -0400
Merge topic 'clean-up-Parser' into next
7b4b6e82 fix error
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b4b6e82de18ab6fc8156f047f900b57fd3c4fff
commit 7b4b6e82de18ab6fc8156f047f900b57fd3c4fff
Author: Stephen Kelly
AuthorDate: Sun Jun 12 21:57:15 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Jun 12 21:57:15 2016 +0200
fix error
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 52b18f8..5e512e2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -47,7 +47,7 @@ cmListFileParser::cmListFileParser(cmListFile* lf,
cmMakefile* mf,
const char* filename)
: ListFile(lf)
, Makefile(mf)
- , Backtrace(this->Makefile->GetBacktrace())
+ , Backtrace(mf->GetBacktrace())
, FileName(filename)
, Lexer(cmListFileLexer_New())
{
---
Summary of changes:
Source/cmListFileCache.cxx |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.6.0-rc1-254-gf3a1b9a
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 f3a1b9ac463d290948700ae3e2ebf8a74cb31d44 (commit)
via 4c906353577e6b6687ae77f550a496f30ec89894 (commit)
via bd2b051d2d3dddbfadfb7d37001071d2e3fd9e76 (commit)
from 80c3bc166b338baf37a8be17c30b993dc9934ab1 (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=f3a1b9ac463d290948700ae3e2ebf8a74cb31d44
commit f3a1b9ac463d290948700ae3e2ebf8a74cb31d44
Merge: 80c3bc1 4c90635
Author: Stephen Kelly
AuthorDate: Sun Jun 12 13:03:51 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 13:03:51 2016 -0400
Merge topic 'clean-up-Parser' into next
4c906353 Parser: Out-of-line conditional code to cmMakefile
bd2b051d Parser: Issue file open error messages through dedicated API
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c906353577e6b6687ae77f550a496f30ec89894
commit 4c906353577e6b6687ae77f550a496f30ec89894
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:26 2016 +0100
Commit: Stephen Kelly
CommitDate: Sun Jun 12 19:01:18 2016 +0200
Parser: Out-of-line conditional code to cmMakefile
Simplify parser API.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index d0c48d1..52b18f8 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -129,7 +129,7 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -143,76 +143,6 @@ bool cmListFile::ParseFile(const char* filename, bool
topLevel, cmMakefile* mf)
parseError = !parser.ParseFile();
}
- // do we need a cmake_policy(VERSION call?
- if (topLevel) {
-bool hasVersion = false;
-// search for the right policy command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required") {
-hasVersion = true;
-break;
- }
-}
-// if no policy command is found this is an error if they use any
-// non advanced functions or a lot of functions
-if (!hasVersion) {
- bool isProblem = true;
- if (this->Functions.size() < 30) {
-// the list of simple commands DO NOT ADD TO THIS LIST!
-// these commands must have backwards compatibility forever and
-// and that is a lot longer than your tiny mind can comprehend mortal
-std::set allowedCommands;
-allowedCommands.insert("project");
-allowedCommands.insert("set");
-allowedCommands.insert("if");
-allowedCommands.insert("endif");
-allowedCommands.insert("else");
-allowedCommands.insert("elseif");
-allowedCommands.insert("add_executable");
-allowedCommands.insert("add_library");
-allowedCommands.insert("target_link_libraries");
-allowedCommands.insert("option");
-allowedCommands.insert("message");
-isProblem = false;
-for (std::vector::iterator i =
- this->Functions.begin();
- i != this->Functions.end(); ++i) {
- std::string name = cmSystemTools::LowerCase(i->Name);
- if (allowedCommands.find(name) == allowedCommands.end()) {
-isProblem = true;
-break;
- }
-}
- }
-
- if (isProblem) {
-// Tell the top level cmMakefile to diagnose
-// this violation of CMP.
-mf->SetCheckCMP(true);
-
-// Implicitly set the version for the user.
-mf->SetPolicyVersion("2.4");
- }
-}
-bool hasProject = false;
-// search for a project command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "project") {
-hasProject = true;
-break;
- }
-}
-// if no project command is found, add one
-if (!hasProject) {
- cmListFileFunction project;
- project.Name = "PROJECT";
- cmListFileArgument prj("Project", cmListFileArgument::Unquoted, 0);
- project.Arguments.push_back(prj);
- this->Functions.insert(this->Functions.
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-251-g80c3bc1
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 80c3bc166b338baf37a8be17c30b993dc9934ab1 (commit)
via ea5324cd4b570ea757a6da96a7bc85538943e008 (commit)
via df8c3130d6e31558469cd1f0daa63e65cec79af1 (commit)
via 946d1e50dc80bfb593ad7b6d4bded279fa17ced9 (commit)
via 096c7754b3b7edd2e69f79b81b06539e5c9314f3 (commit)
via acf0c0f4446e6d3cee8b00a7ebc39d5d8040e42d (commit)
from 77bb2d46d6359a99b9391e026a679845e9326bb9 (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=80c3bc166b338baf37a8be17c30b993dc9934ab1
commit 80c3bc166b338baf37a8be17c30b993dc9934ab1
Merge: 77bb2d4 ea5324c
Author: Stephen Kelly
AuthorDate: Sun Jun 12 13:02:05 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 13:02:05 2016 -0400
Merge topic 'avoid-cmMakefile-IssueMessage-after-configure' into next
ea5324cd cmMakefile: Port messages for compile features to cmake
df8c3130 cmGlobalGenerator: Don't use cmMakefile::IssueMessage after
configure
946d1e50 cmMakefile: Avoid IssueMessage after configure is finished
096c7754 cmLocalGenerator: Store Backtrace for the directory
acf0c0f4 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea5324cd4b570ea757a6da96a7bc85538943e008
commit ea5324cd4b570ea757a6da96a7bc85538943e008
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:27 2016 +0100
Commit: Stephen Kelly
CommitDate: Sun Jun 12 19:01:45 2016 +0200
cmMakefile: Port messages for compile features to cmake
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c57fa7f..fe31940 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3997,14 +3997,20 @@ bool cmMakefile::AddRequiredTargetFeature(cmTarget*
target,
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< "\"\nversion "
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << ".";
-this->IssueMessage(cmake::FATAL_ERROR, e.str());
+if (error) {
+ *error = e.str();
+} else {
+ this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ this->Backtrace);
+}
return false;
}
target->AppendProperty("COMPILE_FEATURES", feature.c_str());
- return lang == "C" ? this->AddRequiredTargetCFeature(target, feature)
- : this->AddRequiredTargetCxxFeature(target, feature);
+ return lang == "C"
+? this->AddRequiredTargetCFeature(target, feature, error)
+: this->AddRequiredTargetCxxFeature(target, feature, error);
}
bool cmMakefile::CompileFeatureKnown(cmTarget const* target,
@@ -4040,7 +4046,8 @@ bool cmMakefile::CompileFeatureKnown(cmTarget const*
target,
if (error) {
*error = e.str();
} else {
-this->IssueMessage(cmake::FATAL_ERROR, e.str());
+this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ this->Backtrace);
}
return false;
}
@@ -4065,7 +4072,8 @@ const char* cmMakefile::CompileFeaturesAvailable(const
std::string& lang,
if (error) {
*error = e.str();
} else {
- this->IssueMessage(cmake::FATAL_ERROR, e.str());
+ this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+ this->Backtrace);
}
return 0;
}
@@ -4252,7 +4260,8 @@ void cmMakefile::CheckNeededCxxLanguage(const
std::string& feature,
}
bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget* target,
- const std::string& feature) const
+ const std::string& feature,
+ std::string* error) const
{
bool needCxx98 = false;
bool needCxx11 = false;
@@ -4268,7 +4277,12 @@ bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget*
target,
std::ostringstream e;
e << "The CXX_STANDARD property on target \"" << target->GetName()
<< "\" contained an invalid value: \"" << existingCxxStandard << "\".";
- this->IssueMessage(cmake::FATAL_ERROR, e.str());
+ if (error) {
+*error = e.str();
+ } else {
+this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
+
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-245-g77bb2d4
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 77bb2d46d6359a99b9391e026a679845e9326bb9 (commit)
via a4782168d211581fea2fbf7a896e7e46d9a253f0 (commit)
from a30ab870553df2fa8df99aaf1ba850cf664e384a (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=77bb2d46d6359a99b9391e026a679845e9326bb9
commit 77bb2d46d6359a99b9391e026a679845e9326bb9
Merge: a30ab87 a478216
Author: Stephen Kelly
AuthorDate: Sun Jun 12 13:01:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 13:01:06 2016 -0400
Merge topic 'clean-up-Parser' into next
a4782168 Fixup error
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4782168d211581fea2fbf7a896e7e46d9a253f0
commit a4782168d211581fea2fbf7a896e7e46d9a253f0
Author: Stephen Kelly
AuthorDate: Sun Jun 12 18:59:12 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Jun 12 19:00:53 2016 +0200
Fixup error
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 3811b02..52b18f8 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -87,7 +87,8 @@ bool cmListFileParser::ParseFile()
// Verify the Byte-Order-Mark, if any.
if (bom != cmListFileLexer_BOM_None && bom != cmListFileLexer_BOM_UTF8) {
cmListFileLexer_SetFileName(this->Lexer, 0, 0);
-this->IssueFileOpenError("File starts with a Byte-Order-Mark that is not
UTF-8.");
+this->IssueFileOpenError(
+ "File starts with a Byte-Order-Mark that is not UTF-8.");
return false;
}
---
Summary of changes:
Source/cmListFileCache.cxx |3 ++-
1 file changed, 2 insertions(+), 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.6.0-rc1-243-ga30ab87
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 a30ab870553df2fa8df99aaf1ba850cf664e384a (commit)
via 3a467d7ee12fafd0373a977ebdbb580204d15ab9 (commit)
via 4ba7c3978904cbeb9fd91041f223e16bffb4771e (commit)
via 280b763a661d588b54a3be0363b27d21c8583a36 (commit)
via 2f0b2d660ba137205b02303ebb1c72fcf694b2c4 (commit)
from a1064ff6ae876d4e239484f9cfe29701648e1e8f (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=a30ab870553df2fa8df99aaf1ba850cf664e384a
commit a30ab870553df2fa8df99aaf1ba850cf664e384a
Merge: a1064ff 3a467d7
Author: Stephen Kelly
AuthorDate: Sun Jun 12 12:48:27 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 12:48:27 2016 -0400
Merge topic 'clean-up-Parser' into next
3a467d7e Parser: Out-of-line conditional code to cmMakefile
4ba7c397 Parser: Issue file open error messages through dedicated API
280b763a Parser: Issue messages through cmake, not cmSystemTools
2f0b2d66 Parser: Store the Backtrace for use in issuing messages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a467d7ee12fafd0373a977ebdbb580204d15ab9
commit 3a467d7ee12fafd0373a977ebdbb580204d15ab9
Author: Stephen Kelly
AuthorDate: Thu Jan 28 22:10:26 2016 +0100
Commit: Stephen Kelly
CommitDate: Sun Jun 12 18:39:39 2016 +0200
Parser: Out-of-line conditional code to cmMakefile
Simplify parser API.
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index d514f9c..3811b02 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -128,7 +128,7 @@ bool cmListFileParser::ParseFile()
return true;
}
-bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile* mf)
+bool cmListFile::ParseFile(const char* filename, cmMakefile* mf)
{
if (!cmSystemTools::FileExists(filename) ||
cmSystemTools::FileIsDirectory(filename)) {
@@ -142,76 +142,6 @@ bool cmListFile::ParseFile(const char* filename, bool
topLevel, cmMakefile* mf)
parseError = !parser.ParseFile();
}
- // do we need a cmake_policy(VERSION call?
- if (topLevel) {
-bool hasVersion = false;
-// search for the right policy command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required") {
-hasVersion = true;
-break;
- }
-}
-// if no policy command is found this is an error if they use any
-// non advanced functions or a lot of functions
-if (!hasVersion) {
- bool isProblem = true;
- if (this->Functions.size() < 30) {
-// the list of simple commands DO NOT ADD TO THIS LIST!
-// these commands must have backwards compatibility forever and
-// and that is a lot longer than your tiny mind can comprehend mortal
-std::set allowedCommands;
-allowedCommands.insert("project");
-allowedCommands.insert("set");
-allowedCommands.insert("if");
-allowedCommands.insert("endif");
-allowedCommands.insert("else");
-allowedCommands.insert("elseif");
-allowedCommands.insert("add_executable");
-allowedCommands.insert("add_library");
-allowedCommands.insert("target_link_libraries");
-allowedCommands.insert("option");
-allowedCommands.insert("message");
-isProblem = false;
-for (std::vector::iterator i =
- this->Functions.begin();
- i != this->Functions.end(); ++i) {
- std::string name = cmSystemTools::LowerCase(i->Name);
- if (allowedCommands.find(name) == allowedCommands.end()) {
-isProblem = true;
-break;
- }
-}
- }
-
- if (isProblem) {
-// Tell the top level cmMakefile to diagnose
-// this violation of CMP.
-mf->SetCheckCMP(true);
-
-// Implicitly set the version for the user.
-mf->SetPolicyVersion("2.4");
- }
-}
-bool hasProject = false;
-// search for a project command
-for (std::vector::iterator i = this->Functions.begin();
- i != this->Functions.end(); ++i) {
- if (cmSystemTools::LowerCase(i->Name) == "project") {
-hasProject = true;
-break;
- }
-}
-// if no project command is found, add one
-if (!hasProject
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-238-ga1064ff
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 a1064ff6ae876d4e239484f9cfe29701648e1e8f (commit)
via 0a4af0735f2aeec74a723dd6af31db585f1b664e (commit)
via d6e99fa8345f07a72308b8b33f4a31aa7fe9a0fd (commit)
from ed95d2c9aed1241d30c45a32fce775a8977cba77 (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=a1064ff6ae876d4e239484f9cfe29701648e1e8f
commit a1064ff6ae876d4e239484f9cfe29701648e1e8f
Merge: ed95d2c 0a4af07
Author: Stephen Kelly
AuthorDate: Sun Jun 12 12:39:03 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 12 12:39:03 2016 -0400
Merge topic 'fix-Message-API-ISP-violation' into next
0a4af073 cmake: Issue message independent of cmMakefile definition
d6e99fa8 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a4af0735f2aeec74a723dd6af31db585f1b664e
commit 0a4af0735f2aeec74a723dd6af31db585f1b664e
Author: Stephen Kelly
AuthorDate: Sun Jun 12 18:38:33 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Jun 12 18:38:33 2016 +0200
cmake: Issue message independent of cmMakefile definition
The makefile is only used when called by the cmMessageCommand, so inline
the use of it there. It otherwise creates an undesirable dependency on
cmMakefile for issuing messages in the cmake instance, a violation of
the Interface Segregation Principle.
https://en.wikipedia.org/wiki/Interface_segregation_principle
This also makes it more explicit that the variable definitions only
affect the message() command. If an AUTHOR_WARNING is issued for any
other reason, it is not affected. To affect that, it is necessary to
set the cache variable instead of the regular variable.
This is an unfortunate interface quirk, but one which can't be fixed
easily now.
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index f4458a7..dab90c9 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -24,7 +24,6 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
cmake::MessageType type = cmake::MESSAGE;
bool status = false;
bool fatal = false;
- cmake* cm = this->Makefile->GetCMakeInstance();
if (*i == "SEND_ERROR") {
type = cmake::FATAL_ERROR;
++i;
@@ -36,10 +35,11 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
type = cmake::WARNING;
++i;
} else if (*i == "AUTHOR_WARNING") {
-if (cm->GetDevWarningsAsErrors(this->Makefile)) {
+if (this->Makefile->IsSet("CMAKE_SUPPRESS_DEVELOPER_ERRORS") &&
+!this->Makefile->IsOn("CMAKE_SUPPRESS_DEVELOPER_ERRORS")) {
fatal = true;
type = cmake::AUTHOR_ERROR;
-} else if (!cm->GetSuppressDevWarnings(this->Makefile)) {
+} else if (!this->Makefile->IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS")) {
type = cmake::AUTHOR_WARNING;
} else {
return true;
@@ -49,10 +49,11 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
status = true;
++i;
} else if (*i == "DEPRECATION") {
-if (cm->GetDeprecatedWarningsAsErrors(this->Makefile)) {
+if (this->Makefile->IsOn("CMAKE_ERROR_DEPRECATED")) {
fatal = true;
type = cmake::DEPRECATION_ERROR;
-} else if (!cm->GetSuppressDeprecatedWarnings(this->Makefile)) {
+} else if ((!this->Makefile->IsSet("CMAKE_WARN_DEPRECATED") ||
+this->Makefile->IsOn("CMAKE_WARN_DEPRECATED"))) {
type = cmake::DEPRECATION_WARNING;
} else {
return true;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ecbdc61..98ac518 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2447,19 +2447,11 @@ void cmake::RunCheckForUnusedVariables()
#endif
}
-bool cmake::GetSuppressDevWarnings(cmMakefile const* mf) const
-{
- /*
- * The suppression CMake variable may be set in the CMake configuration file
- * itself, so we have to check what its set to in the makefile if we can.
- */
- if (mf) {
-return mf->IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS");
- } else {
-const char* cacheEntryValue =
- this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVELOPER_WARNINGS");
-return cmSystemTools::IsOn(cacheEntryValue);
- }
+bool cmake::GetSuppressDevWarnings() const
+{
+ const char* cacheEntryValue =
+this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVE
[Cmake-commits] CMake branch, next, updated. v3.4.2-2063-g3802255
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 38022559e9947adb274890070499c69738d0deaf (commit)
via 70788e92641c4cf4c3f20af607cc6e203203b420 (commit)
via bd2384f593d0cf2c894ff781c4e5278fff2ac96c (commit)
via ad9394f4fdb69f3f3376d7377fac0a22568aed7c (commit)
via f9599ed42f5bfda35b98936257423f00e260498f (commit)
via 275f2a85b21d781e237dd22252261a0a62d9879b (commit)
from 935a4133753eb587b9b91a6b78832430ff780680 (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=38022559e9947adb274890070499c69738d0deaf
commit 38022559e9947adb274890070499c69738d0deaf
Merge: 935a413 70788e9
Author: Stephen Kelly
AuthorDate: Wed Jan 20 15:36:08 2016 -0500
Commit: CMake Topic Stage
CommitDate: Wed Jan 20 15:36:08 2016 -0500
Merge topic 'reduce-allocations' into next
70788e92 Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix.
bd2384f5 Optimize cmMakefile::ExpandVariablesInStringNew.
ad9394f4 Remove temporary allocations in cmMacroHelper::InvokeInitialPass.
f9599ed4 Remove temporary allocations by extending the lifetime of the
retval.
275f2a85 Remove temporary allocations when calling
cmGeneratorTarget::GetName.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70788e92641c4cf4c3f20af607cc6e203203b420
commit 70788e92641c4cf4c3f20af607cc6e203203b420
Author: Milian Wolff
AuthorDate: Fri Jan 15 14:55:22 2016 +0100
Commit: Stephen Kelly
CommitDate: Wed Jan 20 21:20:55 2016 +0100
Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix.
When the first argument passed is a std::string, we need to take it
by const&, otherwise we copy the string and trigger a temporary
allocation. This patch removes a few 10k temporary allocations when
running the CMake daemon on the KDevelop build dir.
This hotspot was found with heaptrack.
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index ef607d2..54617f3 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -52,13 +52,13 @@ template
size_t cmArraySize(const T (&)[N]) { return N; }
template
-bool cmHasLiteralPrefix(T str1, const char (&str2)[N])
+bool cmHasLiteralPrefix(const T& str1, const char (&str2)[N])
{
return cmHasLiteralPrefixImpl(str1, str2, N - 1);
}
template
-bool cmHasLiteralSuffix(T str1, const char (&str2)[N])
+bool cmHasLiteralSuffix(const T& str1, const char (&str2)[N])
{
return cmHasLiteralSuffixImpl(str1, str2, N - 1);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd2384f593d0cf2c894ff781c4e5278fff2ac96c
commit bd2384f593d0cf2c894ff781c4e5278fff2ac96c
Author: Milian Wolff
AuthorDate: Fri Jan 15 14:37:25 2016 +0100
Commit: Stephen Kelly
CommitDate: Wed Jan 20 21:20:55 2016 +0100
Optimize cmMakefile::ExpandVariablesInStringNew.
We can remove the temporary allocations required for the
default-constructed t_lookup passed into the openstack by refactoring
the code slightly. Furthermore, we use a vector instead of a stack,
since the latter is based on a deque which is not required for a
heap / lifo structure.
This patch removes ~215k allocations.
This hotspot was found with heaptrack.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1b0a99a..ba0d672 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2832,10 +2832,9 @@ cmake::MessageType
cmMakefile::ExpandVariablesInStringNew(
const char* last = in;
std::string result;
result.reserve(source.size());
- std::stack openstack;
+ std::vector openstack;
bool error = false;
bool done = false;
- openstack.push(t_lookup());
cmake::MessageType mtype = cmake::LOG;
cmState* state = this->GetCMakeInstance()->GetState();
@@ -2846,10 +2845,10 @@ cmake::MessageType
cmMakefile::ExpandVariablesInStringNew(
switch(inc)
{
case '}':
-if(openstack.size() > 1)
+if(!openstack.empty())
{
- t_lookup var = openstack.top();
- openstack.pop();
+ t_lookup var = openstack.back();
+ openstack.pop_back();
result.append(last, in - last);
std::string const& lookup = result.substr(var.loc);
const char* value = NULL;
@@ -2970,7 +2969,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
last = start;
in = start - 1;
lookup.loc = result.size();
-openstack.push(lookup);
+openstack.push_bac
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1261-g382dcfc
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 382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d (commit)
via 4ce9742ae33678d8fce189d172c2fffb1a43061c (commit)
from 5373eeccbd6911aa862ecddbbd8fa520646447e6 (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=382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d
commit 382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d
Merge: 5373eec 4ce9742
Author: Stephen Kelly
AuthorDate: Sun Nov 8 08:20:27 2015 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 8 08:20:27 2015 -0500
Merge topic 'fix-alias-target-access' into next
4ce9742a Alias: Fix access at generate-time (#15832)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ce9742ae33678d8fce189d172c2fffb1a43061c
commit 4ce9742ae33678d8fce189d172c2fffb1a43061c
Author: Stephen Kelly
AuthorDate: Sun Nov 8 13:31:25 2015 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 8 13:54:49 2015 +0100
Alias: Fix access at generate-time (#15832)
Commit c389f8bb (cmLocalGenerator: Port Find method away from
GetGeneratorTarget, 2015-10-25) ported the implementation of
FindGeneratorTargetToUse away from the FindTargetToUse method,
but neglected to handle alias targets.
The latter method has a parameter to determine whether to
include alias targets in the search, but as that is only
needed at configure time, this generate-time equivalent does
not need the condition.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d2db42..2126c71 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2274,6 +2274,12 @@ cmGlobalGenerator::FindTarget(const std::string& name,
cmGeneratorTarget*
cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
{
+ std::map::const_iterator ai =
+ this->AliasTargets.find(name);
+ if (ai != this->AliasTargets.end())
+{
+return this->FindGeneratorTargetImpl(ai->second);
+}
if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
{
return tgt;
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index c50b4e6..e1d8966 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -37,7 +37,9 @@ target_include_directories(bat PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}")
add_executable(targetgenerator targetgenerator.cpp)
add_executable(Generator::Target ALIAS targetgenerator)
-add_custom_target(usealias Generator::Target)
+add_subdirectory(subdir)
+
+add_custom_target(usealias Generator::Target $)
add_dependencies(bat usealias)
if (NOT TARGET Another::Alias)
diff --git a/Tests/AliasTarget/subdir/CMakeLists.txt
b/Tests/AliasTarget/subdir/CMakeLists.txt
new file mode 100644
index 000..8c84aea
--- /dev/null
+++ b/Tests/AliasTarget/subdir/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+add_library(tgt STATIC empty.cpp)
+add_library(Sub::tgt ALIAS tgt)
diff --git a/Tests/AliasTarget/subdir/empty.cpp
b/Tests/AliasTarget/subdir/empty.cpp
new file mode 100644
index 000..b19427a
--- /dev/null
+++ b/Tests/AliasTarget/subdir/empty.cpp
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int main(void)
+{
+ return 0;
+}
---
Summary of changes:
Tests/AliasTarget/subdir/CMakeLists.txt |3 +++
Tests/AliasTarget/{ => subdir}/empty.cpp |0
2 files changed, 3 insertions(+)
create mode 100644 Tests/AliasTarget/subdir/CMakeLists.txt
copy Tests/AliasTarget/{ => subdir}/empty.cpp (100%)
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.4.0-rc3-1259-g5373eec
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 5373eeccbd6911aa862ecddbbd8fa520646447e6 (commit)
via 9103d8ace327d34a6bc5085e0ec91abc6e8053f1 (commit)
from 680f645f5d26b05b687965dd1baac38b0551ac9f (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=5373eeccbd6911aa862ecddbbd8fa520646447e6
commit 5373eeccbd6911aa862ecddbbd8fa520646447e6
Merge: 680f645 9103d8a
Author: Stephen Kelly
AuthorDate: Sun Nov 8 07:56:57 2015 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 8 07:56:57 2015 -0500
Merge topic 'fix-install-rules' into next
9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9103d8ace327d34a6bc5085e0ec91abc6e8053f1
commit 9103d8ace327d34a6bc5085e0ec91abc6e8053f1
Author: Stephen Kelly
AuthorDate: Sun Nov 8 13:41:33 2015 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 8 13:56:11 2015 +0100
Install: Move SetHaveInstallRule to a more-obvious place
The moved-from location checks for the existence of whether certain
generators are needed for any target in a loop, rather than whether
the current target has an install rule.
This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move
the SetHaveInstallRule invocation., 2015-07-28). Move the
SetHaveInstallRule call to a more-obvious place where the
cmInstallTargetGenerator is constructed.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..d3c2e26 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,6 +27,7 @@ static cmInstallTargetGenerator*
CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
+ target.SetHaveInstallRule(true);
return new cmInstallTargetGenerator(target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
@@ -753,12 +754,6 @@ bool
cmInstallCommand::HandleTargetsMode(std::vector const& args)
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator;
-if (installsArchive || installsRuntime || installsFramework
-|| installsLibrary || installsBundle)
- {
- target.SetHaveInstallRule(true);
- }
-
this->Makefile->AddInstallGenerator(archiveGenerator);
this->Makefile->AddInstallGenerator(libraryGenerator);
this->Makefile->AddInstallGenerator(runtimeGenerator);
---
Summary of changes:
Source/cmInstallCommand.cxx |7 +--
1 file changed, 1 insertion(+), 6 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.4.0-rc3-1257-g680f645
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 680f645f5d26b05b687965dd1baac38b0551ac9f (commit)
via 87605acb1c89dfe65795fd99b6acb2b9553f74af (commit)
from 3b4c612aac81b5a8ec5e53fcd847eb8a03e3ba59 (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=680f645f5d26b05b687965dd1baac38b0551ac9f
commit 680f645f5d26b05b687965dd1baac38b0551ac9f
Merge: 3b4c612 87605ac
Author: Stephen Kelly
AuthorDate: Sun Nov 8 07:37:37 2015 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 8 07:37:37 2015 -0500
Merge topic 'fix-alias-target-access' into next
87605acb Alias: Fix access at generate-time (#15832)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87605acb1c89dfe65795fd99b6acb2b9553f74af
commit 87605acb1c89dfe65795fd99b6acb2b9553f74af
Author: Stephen Kelly
AuthorDate: Sun Nov 8 13:31:25 2015 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 8 13:36:21 2015 +0100
Alias: Fix access at generate-time (#15832)
Commit c389f8bb (cmLocalGenerator: Port Find method away from
GetGeneratorTarget, 2015-10-25) ported the implementation of
FindGeneratorTargetToUse away from the FindTargetToUse method,
but neglected to handle alias targets.
The latter method has a parameter to determine whether to
include alias targets in the search, but as that is only
needed at configure time, this generate-time equivalent does
not need the condition.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d2db42..2126c71 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2274,6 +2274,12 @@ cmGlobalGenerator::FindTarget(const std::string& name,
cmGeneratorTarget*
cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
{
+ std::map::const_iterator ai =
+ this->AliasTargets.find(name);
+ if (ai != this->AliasTargets.end())
+{
+return this->FindGeneratorTargetImpl(ai->second);
+}
if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
{
return tgt;
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index c50b4e6..e1d8966 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -37,7 +37,9 @@ target_include_directories(bat PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}")
add_executable(targetgenerator targetgenerator.cpp)
add_executable(Generator::Target ALIAS targetgenerator)
-add_custom_target(usealias Generator::Target)
+add_subdirectory(subdir)
+
+add_custom_target(usealias Generator::Target $)
add_dependencies(bat usealias)
if (NOT TARGET Another::Alias)
---
Summary of changes:
Source/cmGlobalGenerator.cxx |6 ++
Tests/AliasTarget/CMakeLists.txt |4 +++-
2 files changed, 9 insertions(+), 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.4.0-rc2-1141-g9783c9d
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 9783c9d76f4feaa77b4952b99179702195c57484 (commit)
via 13a37f5f76eb03e01e9ca225281531233ff0006c (commit)
via 958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit)
via 91a829c165209b96c20d17f8eb7d46d3375cc57c (commit)
via e021388798eec587a4dbed6f28555d64b8d9 (commit)
via 0554c2c970bf12dba01b408f3d8a103ede10a30b (commit)
via b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit)
from b0338173a7374c328c7b10691da55d4ffa57fda5 (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=9783c9d76f4feaa77b4952b99179702195c57484
commit 9783c9d76f4feaa77b4952b99179702195c57484
Merge: b033817 13a37f5
Author: Stephen Kelly
AuthorDate: Tue Oct 27 16:54:59 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 27 16:54:59 2015 -0400
Merge topic 'minor-cleanups' into next
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13a37f5f76eb03e01e9ca225281531233ff0006c
commit 13a37f5f76eb03e01e9ca225281531233ff0006c
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:54:12 2015 +0100
cmMakefile: Fix typo in comment
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const
std::vector&name) const
{
cmSourceGroup* sg = 0;
- // first look for source group starting with the same as the one we wants
+ // first look for source group starting with the same as the one we want
for (std::vector::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=958508bb1fa8854cfe7bc4386fe83c82fed73e65
commit 958508bb1fa8854cfe7bc4386fe83c82fed73e65
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:54:11 2015 +0100
cmMakefile: Fix style
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
{
std::vector nameVector;
nameVector.push_back(name);
- AddSourceGroup(nameVector, regex);
+ this->AddSourceGroup(nameVector, regex);
}
void cmMakefile::AddSourceGroup(const std::vector& name,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91a829c165209b96c20d17f8eb7d46d3375cc57c
commit 91a829c165209b96c20d17f8eb7d46d3375cc57c
Author: Stephen Kelly
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:54:11 2015 +0100
Makefiles: Remove unused variable
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
void cmLocalUnixMakefileGenerator3::
GetLocalObjectFiles(std::map &localObjectFiles)
{
- std::set emitted;
std::vector targets = this->GetGeneratorTargets();
for(std::vector::iterator ti = targets.begin();
ti != targets.end(); ++ti)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e021388798eec587a4dbed6f28555d64b8d9
commit e021388798eec587a4dbed6f28555d64b8d9
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:54:11 2015 +0100
cmTarget: Remove obsolete member
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsAndroid = false;
- this->IsApple = false;
this->IsImportedTarget = false;
this->BuildInterfaceIncludesAppended = false;
}
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"),
"Android") == 0;
- // Check whether we are targetin
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1134-gb033817
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 b0338173a7374c328c7b10691da55d4ffa57fda5 (commit)
via 6a56c8247fa874bd418c3e175c941070dafb0e76 (commit)
via 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (commit)
via 8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit)
from 543db74ee695f2da558b1524a77850dd2d491fbd (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=b0338173a7374c328c7b10691da55d4ffa57fda5
commit b0338173a7374c328c7b10691da55d4ffa57fda5
Merge: 543db74 6a56c82
Author: Stephen Kelly
AuthorDate: Tue Oct 27 16:46:22 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 27 16:46:22 2015 -0400
Merge topic 'fix-ctest_test-parallel-execution' into next
6a56c824 Tests: Disable parallel test execution while running ctest_test
5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable
8c13f0f7 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a56c8247fa874bd418c3e175c941070dafb0e76
commit 6a56c8247fa874bd418c3e175c941070dafb0e76
Author: Stephen Kelly
AuthorDate: Tue Oct 27 21:41:36 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:44:04 2015 +0100
Tests: Disable parallel test execution while running ctest_test
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index e2f380c..1b31726 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -71,6 +71,7 @@ add_test(NAME PassingTest COMMAND ${CMAKE_COMMAND} -E echo
PassingTestOutput)
add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command)
]])
+ unset(ENV{CTEST_PARALLEL_LEVEL})
run_ctest(TestOutputSize)
endfunction()
run_TestOutputSize()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
commit 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
Author: Stephen Kelly
AuthorDate: Tue Oct 27 21:41:31 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 21:42:24 2015 +0100
Tests: Don't overwrite RunCMake_TEST_FAILED variable
diff --git a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
index 918d242..74ad669 100644
--- a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
+++ b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
@@ -4,14 +4,14 @@ if(test_xml_file)
if("${test_xml}" MATCHES [[(.*).*(.*)]])
set(test_passed "${CMAKE_MATCH_1}")
set(test_failed "${CMAKE_MATCH_2}")
+if(NOT "${test_passed}" MATCHES [[PassingTes\.\.\..*10 bytes]])
+ set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at
10 bytes:\n ${test_passed}")
+elseif(NOT "${test_failed}" MATCHES [[CMake Error:\.\.\..*12
bytes]])
+ set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at
12 bytes:\n ${test_failed}")
+endif()
else()
set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed
test:\n ${test_xml}")
endif()
- if(NOT "${test_passed}" MATCHES [[PassingTes\.\.\..*10 bytes]])
-set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10
bytes:\n ${test_passed}")
- elseif(NOT "${test_failed}" MATCHES [[CMake Error:\.\.\..*12 bytes]])
-set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12
bytes:\n ${test_failed}")
- endif()
else()
set(RunCMake_TEST_FAILED "Test.xml not found")
endif()
---
Summary of changes:
Source/CMakeVersion.cmake|2 +-
Tests/RunCMake/ctest_test/RunCMakeTest.cmake |1 +
Tests/RunCMake/ctest_test/TestOutputSize-check.cmake | 10 +-
3 files changed, 7 insertions(+), 6 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.4.0-rc2-1126-gb398ad6
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 b398ad685ee8e6becd8a8da37af80d12e4d8e14d (commit)
via 08147a9a0cee722196ddf8d63c25c5d1f8ebd336 (commit)
from dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (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=b398ad685ee8e6becd8a8da37af80d12e4d8e14d
commit b398ad685ee8e6becd8a8da37af80d12e4d8e14d
Merge: dcf76f3 08147a9
Author: Stephen Kelly
AuthorDate: Tue Oct 27 04:08:47 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 27 04:08:47 2015 -0400
Merge topic 'use-correct-rcc-command-option' into next
08147a9a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1
(#15644)"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08147a9a0cee722196ddf8d63c25c5d1f8ebd336
commit 08147a9a0cee722196ddf8d63c25c5d1f8ebd336
Author: Stephen Kelly
AuthorDate: Tue Oct 27 09:00:24 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 09:08:25 2015 +0100
Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.
It was the wrong thing to do, as made obvious in the bug report because it
changes cmake from doing the right thing (using --list) to doing the wrong
thing (using -list, which exists only for compatibility).
Qt 5.1 is old enough that cmake should not get new support for it in
CMake 3.4. That would be a maintainance cost forever, including into Qt 6
times because of the use of the compatibility-only switch.
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx
b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..053c805 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -494,7 +494,7 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
std::vector command;
command.push_back(rccCommand);
- command.push_back("-list");
+ command.push_back("--list");
std::string absFile = cmsys::SystemTools::GetRealPath(
sf->GetFullPath());
---
Summary of changes:
Source/cmQtAutoGeneratorInitializer.cxx |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.4.0-rc2-1124-gdcf76f3
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 dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (commit)
via 79c3a2a8f72ea175533da9f323f88c507220486e (commit)
via c389f8bb07e900d805ca3163f47b06e3dbe4303b (commit)
via 02533038dae9fb5b4ae1b6f7d55bb5af397400af (commit)
via b6278e9ff714d8bdacb54f055eac71fe073b28d8 (commit)
via 7a6caae1a78e8d67422b144ceffdd97595f67683 (commit)
via 0fb187cc589b83ded107d9a9a1971830efb6c751 (commit)
via 8caf1f361b2207522d19bf4a28cecaa3a2391918 (commit)
via 278ba2db477fdc8cccd2313eb56e0179234747a0 (commit)
via 79c11d23405d3894a254a8c03df5ead32464b109 (commit)
via 9b244cc0ecff0cde22b71b7097a3d84c018c6044 (commit)
via def6da616b81958c9f1058a4e520ac3cbc534757 (commit)
via a67231ac114235f0af4673235c4c07fa896c8ab6 (commit)
via d566f39a640297114bd3ad933bb3279440b2f38f (commit)
via 0c97d32f7a592a768d614c19b3fd48eab245a2c4 (commit)
via 383bfd95432990365ac5c7fc3ab190bfb05cbec1 (commit)
via 7f6beddae372a7ae47789f5460bcdfdac39c64e6 (commit)
via 520ca0ff6c123250c633a3618459d0161cbc4683 (commit)
via 3e3c754b8cc3af463dcea95000daf3a18b359b7a (commit)
via 593f347b5385a510e641eca0448f7ddf64c1c12b (commit)
via 7b127c62d4d4c94cf96e9d406859dbd24eed7dc9 (commit)
via 780bff5279c6c2d356e5c7726b656bd9c68532b8 (commit)
via 6bd7bd1e06fcf92d40c762f2713626d125cb8f87 (commit)
via b397eae82e14fdf75eddcbfd022d9f2d5933eb1e (commit)
via 00b8c0a8d4b59dc01276d083ccae4a8138718b12 (commit)
via 4c6374bcc56ea7d7f7e67c518e60de94be267256 (commit)
via 7d409f500e3403f8dbb4a0fee6ecdad94f45c35e (commit)
via 7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a (commit)
via 736c2042c6bade0322441aafabababcbd92af52e (commit)
via f210cb131e5814631d6d2974cf2437632446654f (commit)
from e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (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=dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe
commit dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe
Merge: e1cff3e 79c3a2a
Author: Stephen Kelly
AuthorDate: Tue Oct 27 02:45:00 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 27 02:45:00 2015 -0400
Merge topic 'use-generator-target' into next
79c3a2a8 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
c389f8bb cmLocalGenerator: Port Find method away from GetGeneratorTarget
02533038 VS6: Port to FindGeneratorTarget
b6278e9f cmake: Port find_package mode away from GetGeneratorTarget
7a6caae1 cmMakefile: Add imported target accessor
0fb187cc CMP0026: Port away from GetGeneratorTarget
8caf1f36 cmGlobalGenerator: Add FindGeneratorTarget API
278ba2db cmGeneratorTarget: Add API for globally visible IMPORTED
79c11d23 Xcode: Port away from GetGeneratorTarget
9b244cc0 cmLocalGenerator: Store imported targets in a separate container.
def6da61 cmLocalGenerator: Port FindGeneratorTarget away from
GetGeneratorTarget
a67231ac cmTarget: Implement ALIAS in terms of name mapping
d566f39a cmGlobalGenerator: Remove unneeded GetGeneratorTarget
0c97d32f cmGlobalGenerator: Remove direct storage of targets
383bfd95 cmTargetCollectLinkLanguages: Remove cmMakefile dependency
7f6bedda cmGeneratorTarget: Port cmOptionalLinkImplementation
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79c3a2a8f72ea175533da9f323f88c507220486e
commit 79c3a2a8f72ea175533da9f323f88c507220486e
Author: Stephen Kelly
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 07:44:26 2015 +0100
cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
The configure-time and generate-time types should be completely
independent.
Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
this->CreateLocalGenerators();
- cmDeleteAll(this->GeneratorTargets);
- this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
this->ComputeBuildFileGenerators();
}
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
{
cmTarget* t = &ti->second;
cmGenerat
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1094-ge1cff3e
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 e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (commit)
via e45be64386ea6974c27e58f8253a7144956fd767 (commit)
via 4960ce1287665ddbaec12424c722f4d0018a7756 (commit)
from f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (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=e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
commit e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
Merge: f94ceec e45be64
Author: Stephen Kelly
AuthorDate: Tue Oct 27 02:43:51 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 27 02:43:51 2015 -0400
Merge topic 'use-generator-target' into next
e45be643 fixup! cmTarget: Make compatbility API explicit.
4960ce12 fixup! cmGlobalGenerator: Remove direct storage of targets
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e45be64386ea6974c27e58f8253a7144956fd767
commit e45be64386ea6974c27e58f8253a7144956fd767
Author: Stephen Kelly
AuthorDate: Tue Oct 27 07:42:07 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 07:42:07 2015 +0100
fixup! cmTarget: Make compatbility API explicit.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 35c6084..ffe92af 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
// system generation uses up-to-date information even if other cache
// invalidation code in this source file is buggy.
- l->second.AnalyzeLibDependenciesForVS6(this);
+ l->second.AnalyzeLibDependenciesForVS6(*this);
}
}
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4960ce1287665ddbaec12424c722f4d0018a7756
commit 4960ce1287665ddbaec12424c722f4d0018a7756
Author: Stephen Kelly
AuthorDate: Tue Oct 27 07:41:48 2015 +0100
Commit: Stephen Kelly
CommitDate: Tue Oct 27 07:41:48 2015 +0100
fixup! cmGlobalGenerator: Remove direct storage of targets
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index b7478f9..5e239b8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
{
if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
{
- (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+ (*ti)->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
}
}
}
---
Summary of changes:
Source/cmGlobalVisualStudio8Generator.cxx |2 +-
Source/cmMakefile.cxx |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.4.0-rc2-1091-gf94ceec
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 f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (commit)
via 1385ec49f071e81838bcb5bf8973c6fcbba9e280 (commit)
via 0e0a60ac4ea0687ddd991b80762f591b79f2b528 (commit)
via 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847 (commit)
via a7dec996fb26a27411cafe2872ad255e741f3fb4 (commit)
via b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0 (commit)
via c941d7e324b88ec7cda88dbe99e64b1b37f42cff (commit)
via ce43ed2cc14f96c56441da9908053737efbaaf2e (commit)
from 5faad89d23c55235bfa4510c7378bae5620053ae (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=f94ceec95d7444fc6d4f151f8d8a07643ec27db6
commit f94ceec95d7444fc6d4f151f8d8a07643ec27db6
Merge: 5faad89 1385ec4
Author: Stephen Kelly
AuthorDate: Mon Oct 26 18:50:25 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 18:50:25 2015 -0400
Merge topic 'minor-cleanups' into next
1385ec49 cmMakefile: Fix typo in comment
0e0a60ac cmMakefile: Fix style
58f96e3e Makefiles: Remove unused variable
a7dec996 cmTarget: Remove obsolete member
b5f23d67 cmTarget: Fix style
c941d7e3 Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1385ec49f071e81838bcb5bf8973c6fcbba9e280
commit 1385ec49f071e81838bcb5bf8973c6fcbba9e280
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmMakefile: Fix typo in comment
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const
std::vector&name) const
{
cmSourceGroup* sg = 0;
- // first look for source group starting with the same as the one we wants
+ // first look for source group starting with the same as the one we want
for (std::vector::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e0a60ac4ea0687ddd991b80762f591b79f2b528
commit 0e0a60ac4ea0687ddd991b80762f591b79f2b528
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmMakefile: Fix style
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
{
std::vector nameVector;
nameVector.push_back(name);
- AddSourceGroup(nameVector, regex);
+ this->AddSourceGroup(nameVector, regex);
}
void cmMakefile::AddSourceGroup(const std::vector& name,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
commit 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
Author: Stephen Kelly
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:50:06 2015 +0100
Makefiles: Remove unused variable
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
void cmLocalUnixMakefileGenerator3::
GetLocalObjectFiles(std::map &localObjectFiles)
{
- std::set emitted;
std::vector targets = this->GetGeneratorTargets();
for(std::vector::iterator ti = targets.begin();
ti != targets.end(); ++ti)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7dec996fb26a27411cafe2872ad255e741f3fb4
commit a7dec996fb26a27411cafe2872ad255e741f3fb4
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:50:06 2015 +0100
cmTarget: Remove obsolete member
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsAndroid = false;
- this->IsApple = false;
this->IsImportedTarget = false;
this->BuildInterfaceIncludesAppended = false;
}
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
strcmp(this->Makefile->GetSafeDefinition(
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1083-g5faad89
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 5faad89d23c55235bfa4510c7378bae5620053ae (commit)
via 164d11d3dbb65359fa64ff1b33478d7a21c3cf62 (commit)
via 58a001242c3342838d4cd19303b093eceff678ca (commit)
via 4ae36de53a171357889825a863460c8eda56844d (commit)
via 3c9b31e2576c518117266429de50298b86bd7bb8 (commit)
via 77cdfa1ce75e992b58a00b004d1dcfbe84a86c5f (commit)
via 82913d2acfeb90b442703bd53b7c8cf9015d3d9a (commit)
via db2a97da1ef82d54a9a4a86c125c8accf3dd0814 (commit)
via 2dc870c081a5a1d292ff57e8baea3e80a83a8bb3 (commit)
via 88eced78c37f90729afd43e466568e240b95a5fc (commit)
via c0ae76151e252e572d2abf8fafc08fb3eaec8563 (commit)
via 47bc139ee6e7043b1486a89e97a25941cb00a356 (commit)
via 6316178da0d01778eb7a82e0c2c77526f0a0e47a (commit)
via 778a3a92b1dae56edd24782da7b75d0a61e5 (commit)
via 4826709d4b314fb30398ee9ee0060876b772abde (commit)
via 270344ffbaabf2a0bc44a2dadf7fe63c302fc124 (commit)
via 063d1758e064310ef90b803ab03ab16d8324b6fb (commit)
via ad90bf916fde6ee0b929bb971053a09d6f89ef20 (commit)
via ae3b13d414dc4802805302b2d754fa915e78e379 (commit)
via fc97ea8c4e75885d8f21838e8096fadcbf5318b7 (commit)
via 92c573bbf930e9e7d67e27f328d5627659e089e6 (commit)
via 2861573b6ed32cc6d1779f23cc00d58d35123cb7 (commit)
via a4ac72e7c925081e8f353e6fb62d9c782a8fca3a (commit)
via 6b90c1a174ccce659569ad2c630275bd0d60e73d (commit)
via cce8b1abbc622503188f525347d877523d74d0f0 (commit)
via 3721fca04d6fff4c337e862192f1fe86bc1ce754 (commit)
via af464f982ccde44217892200ef3279456ce220b2 (commit)
via a39310dc2250b061db63ca2e0c78aa080b8ab63b (commit)
via 49e77f3cb0d4365e333140911b3a782512bfe4bb (commit)
via 32ce5957282a4e09ae7023c4ba3ff3b058998637 (commit)
from c71153606ef52a10fe8d1867f169bf28a8baf9fb (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=5faad89d23c55235bfa4510c7378bae5620053ae
commit 5faad89d23c55235bfa4510c7378bae5620053ae
Merge: c711536 164d11d
Author: Stephen Kelly
AuthorDate: Mon Oct 26 18:49:15 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 18:49:15 2015 -0400
Merge topic 'use-generator-target' into next
164d11d3 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
58a00124 cmLocalGenerator: Port Find method away from GetGeneratorTarget
4ae36de5 VS6: Port to FindGeneratorTarget
3c9b31e2 cmake: Port find_package mode away from GetGeneratorTarget
77cdfa1c cmMakefile: Add imported target accessor
82913d2a CMP0026: Port away from GetGeneratorTarget
db2a97da cmGlobalGenerator: Add FindGeneratorTarget API
2dc870c0 cmGeneratorTarget: Add API for globally visible IMPORTED
88eced78 Xcode: Port away from GetGeneratorTarget
c0ae7615 cmLocalGenerator: Store imported targets in a separate container.
47bc139e cmLocalGenerator: Port FindGeneratorTarget away from
GetGeneratorTarget
6316178d cmTarget: Implement ALIAS in terms of name mapping
778a3a92 cmGlobalGenerator: Remove unneeded GetGeneratorTarget
4826709d cmGlobalGenerator: Remove direct storage of targets
270344ff cmTargetCollectLinkLanguages: Remove cmMakefile dependency
063d1758 cmGeneratorTarget: Port cmOptionalLinkImplementation
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=164d11d3dbb65359fa64ff1b33478d7a21c3cf62
commit 164d11d3dbb65359fa64ff1b33478d7a21c3cf62
Author: Stephen Kelly
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:48:51 2015 +0100
cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
The configure-time and generate-time types should be completely
independent.
Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
this->CreateLocalGenerators();
- cmDeleteAll(this->GeneratorTargets);
- this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
this->ComputeBuildFileGenerators();
}
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
{
cmTarget* t = &ti->second;
cmGenerat
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1053-gc711536
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 c71153606ef52a10fe8d1867f169bf28a8baf9fb (commit)
via 83ac11ddee0b40999bd94d52c4fffd09ab268a43 (commit)
via ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742 (commit)
from 4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (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=c71153606ef52a10fe8d1867f169bf28a8baf9fb
commit c71153606ef52a10fe8d1867f169bf28a8baf9fb
Merge: 4f9e8fe 83ac11d
Author: Stephen Kelly
AuthorDate: Mon Oct 26 18:46:56 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 18:46:56 2015 -0400
Merge topic 'use-generator-target' into next
83ac11dd fixup! cmTarget: Make compatbility API explicit.
ce3a4cde fixup! cmGlobalGenerator: Remove map from cmTarget to
cmGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ac11ddee0b40999bd94d52c4fffd09ab268a43
commit 83ac11ddee0b40999bd94d52c4fffd09ab268a43
Author: Stephen Kelly
AuthorDate: Mon Oct 26 23:46:11 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:46:11 2015 +0100
fixup! cmTarget: Make compatbility API explicit.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fc23760..35c6084 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -733,7 +733,7 @@ void cmMakefile::ConfigureFinalPass()
}
#if defined(_WIN32) && !defined(__CYGWIN__)
// Do old-style link dependency analysis only for CM_USE_OLD_VS6.
- if(this->Makefile->GetGlobalGenerator()->IsForVS6())
+ if(this->GetGlobalGenerator()->IsForVS6())
{
for (cmTargets::iterator l = this->Targets.begin();
l != this->Targets.end(); l++)
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
// system generation uses up-to-date information even if other cache
// invalidation code in this source file is buggy.
- l->second->AnalyzeLibDependenciesForVS6(this);
+ l->second.AnalyzeLibDependenciesForVS6(this);
}
}
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
commit ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
Author: Stephen Kelly
AuthorDate: Mon Oct 26 23:44:17 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:44:17 2015 +0100
fixup! cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 9f36b54..b7478f9 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -353,16 +353,17 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
cmGlobalVisualStudio7Generator::AddExtraIDETargets();
if(this->AddCheckTarget())
{
-for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
- cmTargets& tgts = this->Makefiles[i]->GetTargets();
+ std::vector tgts =
+ this->LocalGenerators[i]->GetGeneratorTargets();
// All targets depend on the build-system check target.
- for(cmTargets::iterator ti = tgts.begin();
+ for(std::vector::iterator ti = tgts.begin();
ti != tgts.end(); ++ti)
{
-if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
{
- ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+ (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
}
}
}
---
Summary of changes:
Source/cmGlobalVisualStudio8Generator.cxx | 11 ++-
Source/cmMakefile.cxx |4 ++--
2 files changed, 8 insertions(+), 7 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.4.0-rc2-1050-g4f9e8fe
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 4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (commit)
via f612829d6646566c22e52801dcef139eaf93138c (commit)
via a8c067ddda62aa792afdd3cad96c7b5e91782044 (commit)
via f2071631488fbc22d309bef66e839f21bfa996a2 (commit)
via cc35daad41c2dca7625f0cb509083eaf18df1d2a (commit)
from e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f (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=4f9e8feff6fdfe494c2593f9a134b9bdf95482c6
commit 4f9e8feff6fdfe494c2593f9a134b9bdf95482c6
Merge: e7e0c3d f612829
Author: Stephen Kelly
AuthorDate: Mon Oct 26 18:22:20 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 18:22:20 2015 -0400
Merge topic 'use-generator-target' into next
f612829d cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
a8c067dd cmLocalGenerator: Port Find method away from GetGeneratorTarget
f2071631 VS6: Port to FindGeneratorTarget
cc35daad cmake: Port find_package mode away from GetGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f612829d6646566c22e52801dcef139eaf93138c
commit f612829d6646566c22e52801dcef139eaf93138c
Author: Stephen Kelly
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 23:19:50 2015 +0100
cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
The configure-time and generate-time types should be completely
independent.
Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
this->CreateLocalGenerators();
- cmDeleteAll(this->GeneratorTargets);
- this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
this->ComputeBuildFileGenerators();
}
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
{
cmTarget* t = &ti->second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
- this->GeneratorTargets[t] = gt;
lg->AddGeneratorTarget(gt);
}
}
@@ -1622,9 +1619,9 @@ void
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
j = mf->GetOwnedImportedTargets().begin();
j != mf->GetOwnedImportedTargets().end(); ++j)
{
- cmGeneratorTarget* gt =
- new cmGeneratorTarget(*j, this->LocalGenerators[i]);
- this->GeneratorTargets[*j] = gt;
+ cmLocalGenerator* lg = this->LocalGenerators[i];
+ cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+ lg->AddOwnedImportedGeneratorTarget(gt);
importedMap[*j] = gt;
}
}
@@ -1641,9 +1638,6 @@ void
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
//
void cmGlobalGenerator::ClearGeneratorMembers()
{
- cmDeleteAll(this->GeneratorTargets);
- this->GeneratorTargets.clear();
-
cmDeleteAll(this->BuildExportSets);
this->BuildExportSets.clear();
@@ -1662,20 +1656,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
}
//
-cmGeneratorTarget*
-cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
-{
- cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
- if(ti == this->GeneratorTargets.end())
-{
-this->CMakeInstance->IssueMessage(
- cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
-return 0;
-}
- return ti->second;
-}
-
-//
void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
{
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..bc6e17d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,10 +42,6 @@ class cmInstallTargetGenerator;
class cmInstallFilesGenerator;
class cmExportBuildFileGenerator;
-typedef std::map cmGeneratorTargetsType;
-
/** \class cmGlobalGenerator
* \brief Responsible for overseeing the generation process for the entire tree
*
@@ -307,14 +303,6 @@ public:
TargetDependSet const& Get
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1045-ge7e0c3d
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 e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f (commit)
via b1be66ed644728d981d26e67a375a69cb23506b2 (commit)
via a00135f26ba8f5c8d6bd7d5751c2e229455170b5 (commit)
via f6e2ec7ba59e0231d128de54c8cc4a535c651197 (commit)
via 82153a79e944e44594ff7eb9a39f37d1cf000675 (commit)
via fd5e3ad4a1c5f9ef8e6bd3f19bc1620c58010f93 (commit)
via 878cebd3c9ce7d5dec268fb5b4d55b18c8b4e4a4 (commit)
via a84f34ef545e626650df811a711b61995d8b7a47 (commit)
via 7ef7920915b014e38f4e1fcd79bcd291b9497934 (commit)
via d90c9738da7003b966036c70727611b17d17f3a6 (commit)
via 331023ae06b795a1733ae03dce2ce2197ca1c36a (commit)
via a03f3d0e01edcb617813144626400058a5c0a177 (commit)
via d50c4220e29ef0b7366f3e1812f0a79736f2c18e (commit)
via 803f1901784937e40717fbf6cc675eb7aacbcce1 (commit)
from 623dca799db66d64cc9a8d534f9b47bc4ab8c2e7 (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=e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f
commit e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f
Merge: 623dca7 b1be66e
Author: Stephen Kelly
AuthorDate: Mon Oct 26 17:55:03 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 17:55:03 2015 -0400
Merge topic 'minor-cleanups' into next
b1be66ed cmMakefile: Fix typo in comment
a00135f2 cmMakefile: Fix style
f6e2ec7b Makefiles: Remove unused variable
82153a79 cmTarget: Remove obsolete member
fd5e3ad4 cmTarget: Fix style
878cebd3 Remove some obsolete declarations
a84f34ef Use LocalGenerator when possible
7ef79209 Remove unused includes
d90c9738 Makefiles: Remove some unneeded casts
331023ae Export: Remove unused variable
a03f3d0e cmFunctionBlocker: Constify method
d50c4220 Xcode: Fix typo in comment
803f1901 Xcode: Remove trailing semicolon
diff --cc Source/cmTarget.cxx
index 1eebd12,da49048..9ea1a34
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -61,9 -61,7 +61,8 @@@ cmTarget::cmTarget(
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsAndroid = false;
- this->IsApple = false;
this->IsImportedTarget = false;
+ this->ImportedGloballyVisible = false;
this->BuildInterfaceIncludesAppended = false;
}
diff --cc Source/cmTarget.h
index 62e10f4,f3a45d3..97b0871
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -349,9 -357,7 +348,8 @@@ private
bool RecordDependencies;
bool DLLPlatform;
bool IsAndroid;
- bool IsApple;
bool IsImportedTarget;
+ bool ImportedGloballyVisible;
bool BuildInterfaceIncludesAppended;
#if defined(_WIN32) && !defined(__CYGWIN__)
bool LinkLibrariesForVS6Analyzed;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1be66ed644728d981d26e67a375a69cb23506b2
commit b1be66ed644728d981d26e67a375a69cb23506b2
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:32:01 2015 +0100
cmMakefile: Fix typo in comment
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const
std::vector&name) const
{
cmSourceGroup* sg = 0;
- // first look for source group starting with the same as the one we wants
+ // first look for source group starting with the same as the one we want
for (std::vector::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a00135f26ba8f5c8d6bd7d5751c2e229455170b5
commit a00135f26ba8f5c8d6bd7d5751c2e229455170b5
Author: Stephen Kelly
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:32:01 2015 +0100
cmMakefile: Fix style
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
{
std::vector nameVector;
nameVector.push_back(name);
- AddSourceGroup(nameVector, regex);
+ this->AddSourceGroup(nameVector, regex);
}
void cmMakefile::AddSourceGroup(const std::vector& name,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6e2ec7ba59e0231d128de54c8cc4a535c651197
commit f6e2ec7ba59e0231d128de54c8cc4a535c651197
Author: Stephen Kelly
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1031-g623dca7
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 623dca799db66d64cc9a8d534f9b47bc4ab8c2e7 (commit)
via 55333e9accde64372a8c5055dde2c9f06f81ee18 (commit)
from 96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b (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=623dca799db66d64cc9a8d534f9b47bc4ab8c2e7
commit 623dca799db66d64cc9a8d534f9b47bc4ab8c2e7
Merge: 96b3231 55333e9
Author: Stephen Kelly
AuthorDate: Mon Oct 26 17:51:51 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 17:51:51 2015 -0400
Merge topic 'use-generator-target' into next
55333e9a Revert "cmLocalGenerator: Port Find method away from
GetGeneratorTarget"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55333e9accde64372a8c5055dde2c9f06f81ee18
commit 55333e9accde64372a8c5055dde2c9f06f81ee18
Author: Stephen Kelly
AuthorDate: Mon Oct 26 22:51:33 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:51:33 2015 +0100
Revert "cmLocalGenerator: Port Find method away from GetGeneratorTarget"
This reverts commit d111fa6817c5974a9fb4bc3b0d604493fee12a19.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..5928fb5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,12 +1583,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
}
//
-void cmGlobalGenerator::CreateGeneratorTargets(
-TargetTypes targetTypes,
-cmMakefile *mf,
-cmLocalGenerator *lg,
-std::map const& importedMap)
+void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
+ cmLocalGenerator *lg)
{
+ cmMakefile* mf = lg->GetMakefile();
if (targetTypes == AllTargets)
{
cmTargets& targets = mf->GetTargets();
@@ -1602,38 +1600,23 @@ void cmGlobalGenerator::CreateGeneratorTargets(
}
}
- std::vector itgts = mf->GetImportedTargets();
-
for(std::vector::const_iterator
-j = itgts.begin(); j != itgts.end(); ++j)
+j = mf->GetOwnedImportedTargets().begin();
+ j != mf->GetOwnedImportedTargets().end(); ++j)
{
-lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
+cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+this->GeneratorTargets[*j] = gt;
+lg->AddImportedGeneratorTarget(gt);
}
}
//
void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
{
- std::map importedMap;
- for(unsigned int i=0; i < this->Makefiles.size(); ++i)
-{
-cmMakefile* mf = this->Makefiles[i];
-for(std::vector::const_iterator
- j = mf->GetOwnedImportedTargets().begin();
-j != mf->GetOwnedImportedTargets().end(); ++j)
- {
- cmGeneratorTarget* gt =
- new cmGeneratorTarget(*j, this->LocalGenerators[i]);
- this->GeneratorTargets[*j] = gt;
- importedMap[*j] = gt;
- }
-}
-
// Construct per-target generator information.
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
-this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
- this->LocalGenerators[i], importedMap);
+this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
}
}
@@ -2257,11 +2240,11 @@ cmGeneratorTarget*
cmGlobalGenerator::FindImportedGeneratorTargetImpl(
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
std::vector tgts =
-this->LocalGenerators[i]->GetImportedGeneratorTargets();
+this->LocalGenerators[i]->GetGeneratorTargets();
for (std::vector::iterator it = tgts.begin();
it != tgts.end(); ++it)
{
- if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
+ if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
{
return *it;
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..c52b209 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,9 +485,7 @@ private:
// Per-target generator information.
cmGeneratorTargetsType GeneratorTargets;
friend class cmake;
- void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
- cmLocalGenerator* lg,
-
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1029-g96b3231
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 96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b (commit)
via d111fa6817c5974a9fb4bc3b0d604493fee12a19 (commit)
via 3ba6490b94f1268e6a9901bf5a78dec9459ec64e (commit)
via 3f2388be33118a6f17e7907347eba2b37b13d996 (commit)
from 3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6 (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=96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b
commit 96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b
Merge: 3f2e77e d111fa6
Author: Stephen Kelly
AuthorDate: Mon Oct 26 17:46:16 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 17:46:16 2015 -0400
Merge topic 'use-generator-target' into next
d111fa68 cmLocalGenerator: Port Find method away from GetGeneratorTarget
3ba6490b cmMakefile: Add imported target accessor
3f2388be CMP0026: Port away from GetGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d111fa6817c5974a9fb4bc3b0d604493fee12a19
commit d111fa6817c5974a9fb4bc3b0d604493fee12a19
Author: Stephen Kelly
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:46:05 2015 +0100
cmLocalGenerator: Port Find method away from GetGeneratorTarget
Mirror the cmMakefile::FindTarget method.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
}
//
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
- cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+TargetTypes targetTypes,
+cmMakefile *mf,
+cmLocalGenerator *lg,
+std::map const& importedMap)
{
- cmMakefile* mf = lg->GetMakefile();
if (targetTypes == AllTargets)
{
cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
}
}
+ std::vector itgts = mf->GetImportedTargets();
+
for(std::vector::const_iterator
-j = mf->GetOwnedImportedTargets().begin();
- j != mf->GetOwnedImportedTargets().end(); ++j)
+j = itgts.begin(); j != itgts.end(); ++j)
{
-cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-this->GeneratorTargets[*j] = gt;
-lg->AddImportedGeneratorTarget(gt);
+lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
}
}
//
void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
{
+ std::map importedMap;
+ for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+{
+cmMakefile* mf = this->Makefiles[i];
+for(std::vector::const_iterator
+ j = mf->GetOwnedImportedTargets().begin();
+j != mf->GetOwnedImportedTargets().end(); ++j)
+ {
+ cmGeneratorTarget* gt =
+ new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+ this->GeneratorTargets[*j] = gt;
+ importedMap[*j] = gt;
+ }
+}
+
// Construct per-target generator information.
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
-this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+ this->LocalGenerators[i], importedMap);
}
}
@@ -2240,11 +2257,11 @@ cmGeneratorTarget*
cmGlobalGenerator::FindImportedGeneratorTargetImpl(
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
std::vector tgts =
-this->LocalGenerators[i]->GetGeneratorTargets();
+this->LocalGenerators[i]->GetImportedGeneratorTargets();
for (std::vector::iterator it = tgts.begin();
it != tgts.end(); ++it)
{
- if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+ if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
{
return *it;
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
// Per-target generator information.
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1025-g3f2e77e
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 3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6 (commit)
via 716ad6f482964d7653ba321eea53b48d60a8b745 (commit)
via 2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f (commit)
via 151658ccee329ff2620872d689e5429a3d01196c (commit)
from 19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22 (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=3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6
commit 3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6
Merge: 19ea1c6 716ad6f
Author: Stephen Kelly
AuthorDate: Mon Oct 26 17:45:47 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 17:45:47 2015 -0400
Merge topic 'use-generator-target' into next
716ad6f4 Revert "cmake: Port find_package mode away from GetGeneratorTarget"
2d4fed8f Revert "VS6: Port to FindGeneratorTarget"
151658cc Revert "cmGlobalGenerator: Remove map from cmTarget to
cmGeneratorTarget"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716ad6f482964d7653ba321eea53b48d60a8b745
commit 716ad6f482964d7653ba321eea53b48d60a8b745
Author: Stephen Kelly
AuthorDate: Mon Oct 26 22:45:24 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:45:24 2015 +0100
Revert "cmake: Port find_package mode away from GetGeneratorTarget"
This reverts commit a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2e96e59..16417fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -448,6 +448,7 @@ bool cmake::FindPackage(const std::vector&
args)
// read in the list file to fill the cache
snapshot.SetDefaultDefinitions();
cmsys::auto_ptr mf(new cmMakefile(gg, snapshot));
+ cmsys::auto_ptr lg(gg->CreateLocalGenerator(mf.get()));
mf->SetArgcArgv(args);
@@ -480,8 +481,6 @@ bool cmake::FindPackage(const std::vector&
args)
std::vector includeDirs;
cmSystemTools::ExpandListArgument(includes, includeDirs);
-gg->CreateGenerationObjects();
-cmLocalGenerator* lg = gg->LocalGenerators[0];
std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -511,9 +510,8 @@ bool cmake::FindPackage(const std::vector&
args)
std::string linkPath;
std::string flags;
std::string linkFlags;
-gg->CreateGenerationObjects();
-cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
-cmLocalGenerator* lg = gtgt->GetLocalGenerator();
+gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
+cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
gtgt, false);
linkLibs = frameworkPath + linkPath + linkLibs;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f
commit 2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f
Author: Stephen Kelly
AuthorDate: Mon Oct 26 22:45:21 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:45:21 2015 +0100
Revert "VS6: Port to FindGeneratorTarget"
This reverts commit 495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index cdacb9e..fd0af61 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,14 +1112,15 @@ void cmLocalVisualStudio6Generator
// Compute the proper name to use to link this library.
std::string lib;
std::string libDebug;
- cmGeneratorTarget* tgt =
- this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
+ cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
if(tgt)
{
+cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(tgt);
lib = cmSystemTools::GetFilenameWithoutExtension
- (tgt->GetFullName().c_str());
+ (gt->GetFullName().c_str());
libDebug = cmSystemTools::GetFilenameWithoutExtension
- (tgt->GetFullName("Debug").c_str());
+ (gt->GetFullName("Debug").c_str());
lib += ".lib";
libDebug += ".lib";
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=151658ccee329ff2620872d689e5429a3d01196c
commit 151658ccee329ff2620872d689e542
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1021-g19ea1c6
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 19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22 (commit)
via 3e72e81c21ac623fe849f2272d2052fe2e68c1d6 (commit)
via 04945b5b3bcfb1f38741e59fa74f788847265e52 (commit)
via 2e495b948fb8f18526292be8a0a1a73f5845731b (commit)
via 15470969b867442b5547425f830a71fe4977195d (commit)
via 495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64 (commit)
via a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57 (commit)
via d948be4660331e42e683c6efa8c34513d7b22670 (commit)
via d21c090c5816913599e6d19954f1d3e8fe490063 (commit)
via c637e81d6a0b1d84482ded02702fea8598da8e63 (commit)
via 033d75bacc31269808e2964d0394ca0cff2d4387 (commit)
via c48ec1eb7473ed22f47f43c75902120b76651f4e (commit)
via c36aab2c1e14c8b8e9e3dcfe1d33ff209a3d10e7 (commit)
via 9220295298732e69f2ed3d7c21417d20ec72fef9 (commit)
via 228dfffbe900b161df292a2c826ed84de0d6551d (commit)
via 267736ce1e5827e30fd49c96075adeb123aca2e3 (commit)
via 6bc79630288d468ed1cd669aa3fbda04b5adb7e3 (commit)
via 5b7ed7a73661201dc691477b81ec2436723d263a (commit)
via 4e6d18cf3cb0d2aac2aabe388e3be38153c43a6b (commit)
via 5d30d016f85ba0f94450e60b68ff627be3599318 (commit)
via 14abcc1dbedecfb7aa6a945fcf29f19d3fe4465e (commit)
via 0a500eaaf6e37f5d413d7d2384769e144e951aa2 (commit)
via 26ccc3821fce09e04540dacc3714a3fdb278c6b9 (commit)
via f9c3f0a7ff450d266e54621cfe5009e5aef3ea1e (commit)
via 06fdd262b21f3eb7b23a9d90e2582bdf820122a9 (commit)
via c346202ef815fe600d7970ddf47cdc71fa3b4a47 (commit)
via 882544cdaa44612ae37b60ec5fc45c6909bd8efa (commit)
via 7455293496e8543830b3a5b7c1bffbd58713014f (commit)
via a24eb94f5b608441265eaa591934a4b0b6d1c46b (commit)
via 05fc07b1fe6793147902a4363b61c12ae0c40c5f (commit)
via bde277e811fea2532ed32ade6d7f3d6e910bfda0 (commit)
via cf69630e510a5c639a93a99b315fcefea9688935 (commit)
via 3f8aa62bfb339dded326b0bc36016134a3dc845b (commit)
from 1e9cfc0f22edb7df06dc6059cecb712b06c063a1 (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=19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22
commit 19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22
Merge: 1e9cfc0 3e72e81
Author: Stephen Kelly
AuthorDate: Mon Oct 26 17:26:34 2015 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 26 17:26:34 2015 -0400
Merge topic 'use-generator-target' into next
3e72e81c cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
04945b5b cmLocalGenerator: Port Find method away from GetGeneratorTarget
2e495b94 cmMakefile: Add imported target accessor
15470969 CMP0026: Port away from GetGeneratorTarget
495ef58b VS6: Port to FindGeneratorTarget
a67d87f7 cmake: Port find_package mode away from GetGeneratorTarget
d948be46 cmGlobalGenerator: Add FindGeneratorTarget API
d21c090c cmGeneratorTarget: Add API for globally visible IMPORTED
c637e81d Xcode: Port away from GetGeneratorTarget
033d75ba cmLocalGenerator: Store imported targets in a separate container.
c48ec1eb cmLocalGenerator: Port FindGeneratorTarget away from
GetGeneratorTarget
c36aab2c cmTarget: Implement ALIAS in terms of name mapping
92202952 cmGlobalGenerator: Remove unneeded GetGeneratorTarget
228dfffb cmGlobalGenerator: Remove direct storage of targets
267736ce cmTargetCollectLinkLanguages: Remove cmMakefile dependency
6bc79630 cmGeneratorTarget: Port cmOptionalLinkImplementation
...
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e72e81c21ac623fe849f2272d2052fe2e68c1d6
commit 3e72e81c21ac623fe849f2272d2052fe2e68c1d6
Author: Stephen Kelly
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit: Stephen Kelly
CommitDate: Mon Oct 26 22:19:52 2015 +0100
cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
The configure-time and generate-time types should be completely
independent.
Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
{
this->CreateLocalGenerators();
- cmDeleteAll(this->GeneratorTargets);
- this->GeneratorTargets.clear();
this->CreateGeneratorTargets(targetTypes);
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-969-gb976c49
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 b976c491833cbe263ff972624650087253b2aa30 (commit)
via 6cac952b9ed8ad202286ddee7246d9ef7ed8f22d (commit)
via 97b3768898431824388dc263654a35a33aa2 (commit)
via 600af01d41e32d304e43dc98783ec0f7f010f40e (commit)
via 330bfa83368989f6fd67072ef9f5c9e457230f17 (commit)
via b13e26e278dcc34243a2b31dfca8e23b01e15b76 (commit)
from ab90caa1110936859e9bd2c46aee3e043d2aab6e (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=b976c491833cbe263ff972624650087253b2aa30
commit b976c491833cbe263ff972624650087253b2aa30
Merge: ab90caa 6cac952
Author: Stephen Kelly
AuthorDate: Sat Oct 24 03:24:55 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 24 03:24:55 2015 -0400
Merge topic 'use-generator-target' into next
6cac952b VS: Port interface to cmGeneratorTarget
97b37688 VS: Port WriteUtilityDepends to cmGeneratorTarget
600af01d VS: Port utility depends to cmGeneratorTarget
330bfa83 VS: Port target depends to cmGeneratorTarget
b13e26e2 VS: Port ProjectDepends to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cac952b9ed8ad202286ddee7246d9ef7ed8f22d
commit 6cac952b9ed8ad202286ddee7246d9ef7ed8f22d
Author: Stephen Kelly
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 24 09:24:43 2015 +0200
VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+ { return false; }
const char* GetIntelProjectVersion();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
//
bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
- cmTarget& target)
+cmGeneratorTarget *target)
{
// Look for utility dependencies that magically link.
for(std::set::const_iterator ui =
-target.GetUtilities().begin();
- ui != target.GetUtilities().end(); ++ui)
+target->Target->GetUtilities().begin();
+ ui != target->Target->GetUtilities().end(); ++ui)
{
-if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+if(cmGeneratorTarget* depTarget =
+target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
{
if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
&& depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h
b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
/** Return true if building for Windows CE */
virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
const cmGeneratorTarget *target,
TargetSet& linked)
{
- if(linked.insert(target->Target).second)
+ if(linked.insert(target).second)
{
TargetDependSet const& depends =
this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
cmGlobalVisualStudioGenerator::TargetSet const&
cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cm
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-932-g6052702
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 60527028258a114ce5b7bfb5779f2611f1c1a2c6 (commit)
via b2989d1bfc2730b1539c587142a23f7cbaa3088c (commit)
via 3fdb3490503041d999e8381c11a1e431953204df (commit)
from b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (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=60527028258a114ce5b7bfb5779f2611f1c1a2c6
commit 60527028258a114ce5b7bfb5779f2611f1c1a2c6
Merge: b7fb0ad b2989d1
Author: Stephen Kelly
AuthorDate: Sat Oct 24 03:19:45 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 24 03:19:45 2015 -0400
Merge topic 'use-generator-target' into next
b2989d1b Revert "Xcode: Remove value-less overrides."
3fdb3490 fixup! VS: Port interface to cmGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2989d1bfc2730b1539c587142a23f7cbaa3088c
commit b2989d1bfc2730b1539c587142a23f7cbaa3088c
Author: Stephen Kelly
AuthorDate: Sat Oct 24 09:18:35 2015 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 24 09:18:35 2015 +0200
Revert "Xcode: Remove value-less overrides."
This reverts commit e20951c90df511cf0374a9fa6d27ad8a131b4903.
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 30fd075..3b430d2 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -47,6 +47,36 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string&
flags,
}
//
+void cmLocalXCodeGenerator::Generate()
+{
+ cmLocalGenerator::Generate();
+
+ cmTargets& targets = this->Makefile->GetTargets();
+ for(cmTargets::iterator iter = targets.begin();
+ iter != targets.end(); ++iter)
+{
+cmTarget* t = &iter->second;
+cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+gt->HasMacOSXRpathInstallNameDir("");
+}
+}
+
+//
+void cmLocalXCodeGenerator::GenerateInstallRules()
+{
+ cmLocalGenerator::GenerateInstallRules();
+
+ cmTargets& targets = this->Makefile->GetTargets();
+ for(cmTargets::iterator iter = targets.begin();
+ iter != targets.end(); ++iter)
+{
+cmTarget* t = &iter->second;
+cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+gt->HasMacOSXRpathInstallNameDir("");
+}
+}
+
+//
void cmLocalXCodeGenerator::ComputeObjectFilenames(
std::map& mapping,
cmGeneratorTarget const*)
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 57c1579..4381a6d 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -32,6 +32,8 @@ public:
std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
virtual void AppendFlagEscape(std::string& flags,
const std::string& rawFlag);
+ virtual void Generate();
+ virtual void GenerateInstallRules();
virtual void ComputeObjectFilenames(
std::map& mapping,
cmGeneratorTarget const* gt = 0);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fdb3490503041d999e8381c11a1e431953204df
commit 3fdb3490503041d999e8381c11a1e431953204df
Author: Stephen Kelly
AuthorDate: Sat Oct 24 09:18:11 2015 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 24 09:18:11 2015 +0200
fixup! VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index e185c8e..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -468,7 +468,7 @@ bool
cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
ui != target->Target->GetUtilities().end(); ++ui)
{
if(cmGeneratorTarget* depTarget =
-this->FindGeneratorTarget(ui->c_str()))
+target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
{
if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
&& depTarget->GetProperty("EXTERNAL_MSPROJECT"))
---
Summary of changes:
Source/cmGlobalVisualStudio8Generator.cxx |2 +-
Source/cmLocalXCo
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-929-gb7fb0ad
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 b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (commit)
via 5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e (commit)
from 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (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=b7fb0ad756d908018ecc53ab50c153ec22b4bf4a
commit b7fb0ad756d908018ecc53ab50c153ec22b4bf4a
Merge: 5a023c8 5d7a437
Author: Stephen Kelly
AuthorDate: Sat Oct 24 03:09:12 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 24 03:09:12 2015 -0400
Merge topic 'use-generator-target' into next
5d7a437b VS: Port interface to cmGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e
commit 5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e
Author: Stephen Kelly
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 24 09:08:58 2015 +0200
VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+ { return false; }
const char* GetIntelProjectVersion();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..e185c8e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
//
bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
- cmTarget& target)
+cmGeneratorTarget *target)
{
// Look for utility dependencies that magically link.
for(std::set::const_iterator ui =
-target.GetUtilities().begin();
- ui != target.GetUtilities().end(); ++ui)
+target->Target->GetUtilities().begin();
+ ui != target->Target->GetUtilities().end(); ++ui)
{
-if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+if(cmGeneratorTarget* depTarget =
+this->FindGeneratorTarget(ui->c_str()))
{
if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
&& depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h
b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
/** Return true if building for Windows CE */
virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
const cmGeneratorTarget *target,
TargetSet& linked)
{
- if(linked.insert(target->Target).second)
+ if(linked.insert(target).second)
{
TargetDependSet const& depends =
this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
cmGlobalVisualStudioGenerator::TargetSet const&
cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
{
- TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+ TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
if(i == this->TargetLinkClosure.end())
{
-TargetSetMap::value_type entry(target->Target, TargetSet());
+TargetSetMap::value_type entry(target, TargetSet());
i = this->TargetLinkClosure.insert(entry).first;
this->FillLinkClosure(target
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-927-g5a023c8
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 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (commit)
via 7de7776d7f01054c97e3ca4498cc0f7d8ce106e8 (commit)
from addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (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=5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
commit 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
Merge: addb1da 7de7776
Author: Stephen Kelly
AuthorDate: Sat Oct 24 03:08:50 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sat Oct 24 03:08:50 2015 -0400
Merge topic 'use-generator-target' into next
7de7776d fixup! VS: Port interface to cmGeneratorTarget
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
commit 7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
Author: Stephen Kelly
AuthorDate: Sat Oct 24 09:08:03 2015 +0200
Commit: Stephen Kelly
CommitDate: Sat Oct 24 09:08:03 2015 +0200
fixup! VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 7ee5dd0..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
const cmGeneratorTarget *target,
TargetSet& linked)
{
- if(linked.insert(target->Target).second)
+ if(linked.insert(target).second)
{
TargetDependSet const& depends =
this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
cmGlobalVisualStudioGenerator::TargetSet const&
cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
{
- TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+ TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
if(i == this->TargetLinkClosure.end())
{
-TargetSetMap::value_type entry(target->Target, TargetSet());
+TargetSetMap::value_type entry(target, TargetSet());
i = this->TargetLinkClosure.insert(entry).first;
this->FillLinkClosure(target, i->second);
}
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx |6 +++---
1 file changed, 3 insertions(+), 3 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.4.0-rc2-921-g88b9b0a
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 88b9b0a6f138fa933cd9d286c02fe5a7e255080a (commit)
via 636bcd6428f4c05ff7c0c7d41668e306e2d1789e (commit)
via 8766741e7fefceb2302243e8fcc16def63756c64 (commit)
via 4283faa2f135cafba8481a0ba617b81ee126dd9b (commit)
via 55e1200a87f9775d159906d52955c2055e30560a (commit)
via c0389992b2be8bd4e458a86e066c28380d26ea96 (commit)
via 0fef3c54a68b279bd8f7bc4135886ceb01ea10c7 (commit)
via dd2a1c8d230d2e142aa4ff81f4e1c34c938dd4fe (commit)
via 96e918c6b10483cae8a67b7afd44bcabca39ced4 (commit)
via 065e54e569f7bb47665ec69564e3fccf3dfa0db9 (commit)
via 8778d695e411d65611e38a4cb6e258dba14c93bd (commit)
via b09b42f168772d781d6e80568ed8c986343cf915 (commit)
via 7b9ac9cc4805d2be79364ce2a18baf66e7415110 (commit)
via 650938a289cc5da9304aeaaab6ee3fb85710a204 (commit)
from 22bded47beb0417d004d152ab35e2b57b9e3c338 (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=88b9b0a6f138fa933cd9d286c02fe5a7e255080a
commit 88b9b0a6f138fa933cd9d286c02fe5a7e255080a
Merge: 22bded4 636bcd6
Author: Stephen Kelly
AuthorDate: Fri Oct 23 12:31:56 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri Oct 23 12:31:56 2015 -0400
Merge topic 'use-generator-target' into next
636bcd64 VS: Port interface to cmGeneratorTarget
8766741e VS: Port WriteUtilityDepends to cmGeneratorTarget
4283faa2 VS: Port utility depends to cmGeneratorTarget
55e1200a VS: Port target depends to cmGeneratorTarget
c0389992 VS: Port PorjectDepends to cmGeneratorTarget.
0fef3c54 VS: Port TargetIsFortranOnly to cmGeneratorTarget
dd2a1c8d VS: Port WriteProject to cmGeneratorTarget
96e918c6 VS: Port loop to cmGeneratorTarget
065e54e5 VS: Port ImplibDir to cmGeneratorTarget
8778d695 VS: Port LinkClosure to cmGeneratorTarget
b09b42f1 VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget
7b9ac9cc VS7: Port to cmGeneratorTarget
650938a2 VS10: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=636bcd6428f4c05ff7c0c7d41668e306e2d1789e
commit 636bcd6428f4c05ff7c0c7d41668e306e2d1789e
Author: Stephen Kelly
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Oct 23 18:30:52 2015 +0200
VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+ { return false; }
const char* GetIntelProjectVersion();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..e185c8e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
//
bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
- cmTarget& target)
+cmGeneratorTarget *target)
{
// Look for utility dependencies that magically link.
for(std::set::const_iterator ui =
-target.GetUtilities().begin();
- ui != target.GetUtilities().end(); ++ui)
+target->Target->GetUtilities().begin();
+ ui != target->Target->GetUtilities().end(); ++ui)
{
-if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+if(cmGeneratorTarget* depTarget =
+this->FindGeneratorTarget(ui->c_str()))
{
if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
&& depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h
b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+ virtual bool
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-899-gf271764
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 f271764c40abbc481d9920e907b7a547ffe313fa (commit)
via 940375c6202eaac97b0967204964163b5b683e9d (commit)
from 29164eaa8289efb4891dfc8c46f75d87c5a481d7 (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=f271764c40abbc481d9920e907b7a547ffe313fa
commit f271764c40abbc481d9920e907b7a547ffe313fa
Merge: 29164ea 940375c
Author: Stephen Kelly
AuthorDate: Thu Oct 22 17:12:33 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 17:12:33 2015 -0400
Merge topic 'use-generator-target' into next
940375c6 Partial revert.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=940375c6202eaac97b0967204964163b5b683e9d
commit 940375c6202eaac97b0967204964163b5b683e9d
Author: Stephen Kelly
AuthorDate: Thu Oct 22 23:10:26 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 23:10:53 2015 +0200
Partial revert.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index e568704..161b532 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
this->cmGlobalVisualStudio8Generator::Generate();
if(this->LongestSource.Length > 0)
{
-cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
+cmMakefile* mf = this->LongestSource.Target->GetMakefile();
std::ostringstream e;
e <<
"The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
" " << this->LongestSource.SourceFile->GetFullPath() << "\n"
"This is because some Visual Studio tools would append the relative "
"path to the end of the referencing directory path, as in:\n"
- " " << lg->GetCurrentBinaryDirectory() << "/"
+ " " << mf->GetCurrentBinaryDirectory() << "/"
<< this->LongestSource.SourceRel << "\n"
"and then incorrectly complain that the file does not exist because "
"the path length is too long for some internal buffer or API. "
"To avoid this problem CMake must use a full path for this file "
"which then triggers the VS 10 property dialog bug.";
-lg->IssueMessage(cmake::WARNING, e.str().c_str());
+mf->IssueMessage(cmake::WARNING, e.str().c_str());
}
}
@@ -591,11 +591,9 @@ cmGlobalVisualStudio10Generator
//
void cmGlobalVisualStudio10Generator::PathTooLong(
-cmGeneratorTarget *target, cmSourceFile const* sf,
-std::string const& sfRel)
+ cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
{
- size_t len =
- (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
+ size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
1 + sfRel.length());
if(len > this->LongestSource.Length)
{
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 6bf4740..7600a0d 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
/** Generate an .rule file path for a given command output. */
virtual std::string GenerateRuleFile(std::string const& output) const;
- void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
+ void PathTooLong(cmTarget* target, cmSourceFile const* sf,
std::string const& sfRel);
virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
{
LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
size_t Length;
-cmGeneratorTarget* Target;
+cmTarget* Target;
cmSourceFile const* SourceFile;
std::string SourceRel;
};
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 48c07a8..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
fout << "Package=<5>\n{{{\n}}}\n\n";
fout &l
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-901-g36f0c5e
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 36f0c5e076363d2fbc66dc474f977c1ba32f461d (commit)
via 252e10e0ac05f082269be461ad522e32c84b568c (commit)
from f271764c40abbc481d9920e907b7a547ffe313fa (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=36f0c5e076363d2fbc66dc474f977c1ba32f461d
commit 36f0c5e076363d2fbc66dc474f977c1ba32f461d
Merge: f271764 252e10e
Author: Stephen Kelly
AuthorDate: Thu Oct 22 17:13:07 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 17:13:07 2015 -0400
Merge topic 'use-generator-target' into next
252e10e0 VS6: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=252e10e0ac05f082269be461ad522e32c84b568c
commit 252e10e0ac05f082269be461ad522e32c84b568c
Author: Stephen Kelly
AuthorDate: Thu Oct 22 18:27:56 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 23:12:56 2015 +0200
VS6: Port to cmGeneratorTarget.
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 12eccf9..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -223,7 +223,7 @@ void cmGlobalVisualStudio6Generator
tt = orderedProjectTargets.begin();
tt != orderedProjectTargets.end(); ++tt)
{
-cmTarget const* target = (*tt)->Target;
+cmGeneratorTarget const* target = *tt;
if(target->GetType() == cmState::INTERFACE_LIBRARY)
{
continue;
@@ -235,14 +235,15 @@ void cmGlobalVisualStudio6Generator
std::string project = target->GetName();
std::string location = expath;
this->WriteExternalProject(fout, project.c_str(),
- location.c_str(), target->GetUtilities());
+ location.c_str(), target->Target->GetUtilities());
}
else
{
std::string dspname = GetVS6TargetName(target->GetName());
- std::string dir = target->GetMakefile()->GetCurrentBinaryDirectory();
+ std::string dir =
+ target->GetLocalGenerator()->GetCurrentBinaryDirectory();
dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
- this->WriteProject(fout, dspname.c_str(), dir.c_str(), *target);
+ this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
}
}
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
// Note, that dependencies from executables to
// the libraries it uses are also done here
void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
- const std::string& dspname,
- const char* dir,
- cmTarget const& target)
+const std::string& dspname,
+const char* dir,
+const cmGeneratorTarget *target)
{
fout << "#"
"##\n\n";
@@ -298,7 +299,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
fout << "Package=<5>\n{{{\n}}}\n\n";
fout << "Package=<4>\n";
fout << "{{{\n";
- VSDependSet const& depends = this->VSTargetDepends[&target];
+ VSDependSet const& depends = this->VSTargetDepends[target->Target];
for(VSDependSet::const_iterator di = depends.begin();
di != depends.end(); ++di)
{
@@ -309,7 +310,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
}
fout << "}}}\n\n";
- UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+ UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
if(ui != this->UtilityDepends.end())
{
const char* uname = ui->second.c_str();
@@ -382,7 +383,7 @@ void
cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
//
std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
{
std::string pname = target->GetName();
pname += "_UTILITY";
diff --git a/Source/cmGlobalVisualStudio6
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-892-g2eb7d97
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 2eb7d97faf19dd8e545aac544fba318a86383e36 (commit)
via a8afd07610a92140e7f47af1672cec2441d929a4 (commit)
from ade9860f531113e13ce2c5acb2cbc38797ef3556 (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=2eb7d97faf19dd8e545aac544fba318a86383e36
commit 2eb7d97faf19dd8e545aac544fba318a86383e36
Merge: ade9860 a8afd07
Author: Stephen Kelly
AuthorDate: Thu Oct 22 12:43:30 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 12:43:30 2015 -0400
Merge topic 'use-generator-target' into next
a8afd076 Fix whitespace.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8afd07610a92140e7f47af1672cec2441d929a4
commit a8afd07610a92140e7f47af1672cec2441d929a4
Author: Stephen Kelly
AuthorDate: Thu Oct 22 18:43:04 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 18:43:04 2015 +0200
Fix whitespace.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 0d579bf..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -594,7 +594,8 @@ void cmGlobalVisualStudio10Generator::PathTooLong(
cmGeneratorTarget *target, cmSourceFile const* sf,
std::string const& sfRel)
{
- size_t len =
(strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
+ size_t len =
+ (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
1 + sfRel.length());
if(len > this->LongestSource.Length)
{
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 6b98ab6..48c07a8 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,12 +235,13 @@ void cmGlobalVisualStudio6Generator
std::string project = target->GetName();
std::string location = expath;
this->WriteExternalProject(fout, project.c_str(),
- location.c_str(),
target->Target->GetUtilities());
+ location.c_str(), target->Target->GetUtilities());
}
else
{
std::string dspname = GetVS6TargetName(target->GetName());
- std::string dir =
target->GetLocalGenerator()->GetCurrentBinaryDirectory();
+ std::string dir =
+ target->GetLocalGenerator()->GetCurrentBinaryDirectory();
dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
}
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
// Note, that dependencies from executables to
// the libraries it uses are also done here
void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
- const std::string& dspname,
- const char* dir,
- const cmGeneratorTarget
*target)
+const std::string& dspname,
+const char* dir,
+const cmGeneratorTarget *target)
{
fout << "#"
"##\n\n";
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index 3ab6169..b6caf5b 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*) { return false;
}
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+ { return false; }
const char* GetIntelProjectVersion();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 606e215..31f6475 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -394,7 +394,8 @@ static bool VSLinkable(cmGeneratorTarget const* t)
}
//
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmGeneratorTarget*
target)
+void cmGlobalVisualStudioGenerator::ComputeVS
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-897-g29164ea
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 29164eaa8289efb4891dfc8c46f75d87c5a481d7 (commit)
via 7a846d46997341f52591cdaa0e500d2ae328eb06 (commit)
via 979b1f5bdba2d1d3f27cf9c93013f59094519944 (commit)
via 154405face0b7e8ca7142fc7d2db07ec64f10a73 (commit)
via 3e340be968ce920e7d21156453acad7810b8d51e (commit)
from 2eb7d97faf19dd8e545aac544fba318a86383e36 (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=29164eaa8289efb4891dfc8c46f75d87c5a481d7
commit 29164eaa8289efb4891dfc8c46f75d87c5a481d7
Merge: 2eb7d97 7a846d4
Author: Stephen Kelly
AuthorDate: Thu Oct 22 12:43:50 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 12:43:50 2015 -0400
Merge topic 'use-generator-target' into next
7a846d46 VS: Port interface to cmGeneratorTarget
979b1f5b VS7: Port to cmGeneratorTarget
154405fa VS10: Port to cmGeneratorTarget.
3e340be9 VS6: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a846d46997341f52591cdaa0e500d2ae328eb06
commit 7a846d46997341f52591cdaa0e500d2ae328eb06
Author: Stephen Kelly
AuthorDate: Thu Oct 22 18:27:59 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 18:42:24 2015 +0200
VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 9e411c9..48c07a8 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
fout << "Package=<5>\n{{{\n}}}\n\n";
fout << "Package=<4>\n";
fout << "{{{\n";
- VSDependSet const& depends = this->VSTargetDepends[target->Target];
+ VSDependSet const& depends = this->VSTargetDepends[target];
for(VSDependSet::const_iterator di = depends.begin();
di != depends.end(); ++di)
{
@@ -310,7 +310,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
}
fout << "}}}\n\n";
- UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+ UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
if(ui != this->UtilityDepends.end())
{
const char* uname = ui->second.c_str();
@@ -383,12 +383,13 @@ void
cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
//
std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+const cmGeneratorTarget *target)
{
std::string pname = target->GetName();
pname += "_UTILITY";
pname = GetVS6TargetName(pname.c_str());
- std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+ std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
fname += "/";
fname += pname;
fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h
b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..22ad8a9 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
const std::string& name, const char* path,
const std::set& dependencies);
void WriteDSWFooter(std::ostream& fout);
- virtual std::string WriteUtilityDepend(cmTarget const* target);
+ virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
std::string MSDevCommand;
bool MSDevCommandInitialized;
std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,7 +152,7 @@ void
cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
const std::string& dspname,
const char* dir,
- cmTarget const& t)
+ cmGeneratorTarget const* t)
{
// check to see if this is a fortran build
const char* ext = ".vcproj";
@@ -163,7 +163,7 @@ cmGlobalVisualStudio71Generato
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-890-gade9860
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 ade9860f531113e13ce2c5acb2cbc38797ef3556 (commit)
via 7b668158627f94d69e8dae1c6be7d6f83f0fa49b (commit)
via 732055ef56d0c797ece0af9e2ca396e53734bc1f (commit)
via 5c1433dc295b622be273614470e778fc65460efe (commit)
via a970363ae069e1b40eba2444df303cceb6d5d638 (commit)
from 23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c (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=ade9860f531113e13ce2c5acb2cbc38797ef3556
commit ade9860f531113e13ce2c5acb2cbc38797ef3556
Merge: 23a2ea9 7b66815
Author: Stephen Kelly
AuthorDate: Thu Oct 22 12:29:42 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 12:29:42 2015 -0400
Merge topic 'use-generator-target' into next
7b668158 VS: Port interface to cmGeneratorTarget
732055ef VS7: Port to cmGeneratorTarget
5c1433dc VS10: Port to cmGeneratorTarget.
a970363a VS6: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b668158627f94d69e8dae1c6be7d6f83f0fa49b
commit 7b668158627f94d69e8dae1c6be7d6f83f0fa49b
Author: Stephen Kelly
AuthorDate: Thu Oct 22 18:27:59 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 18:29:06 2015 +0200
VS: Port interface to cmGeneratorTarget
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index 2452743..6b98ab6 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -298,7 +298,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
fout << "Package=<5>\n{{{\n}}}\n\n";
fout << "Package=<4>\n";
fout << "{{{\n";
- VSDependSet const& depends = this->VSTargetDepends[target->Target];
+ VSDependSet const& depends = this->VSTargetDepends[target];
for(VSDependSet::const_iterator di = depends.begin();
di != depends.end(); ++di)
{
@@ -309,7 +309,7 @@ void
cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
}
fout << "}}}\n\n";
- UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+ UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
if(ui != this->UtilityDepends.end())
{
const char* uname = ui->second.c_str();
@@ -382,12 +382,13 @@ void
cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
//
std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+const cmGeneratorTarget *target)
{
std::string pname = target->GetName();
pname += "_UTILITY";
pname = GetVS6TargetName(pname.c_str());
- std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+ std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
fname += "/";
fname += pname;
fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h
b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..22ad8a9 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
const std::string& name, const char* path,
const std::set& dependencies);
void WriteDSWFooter(std::ostream& fout);
- virtual std::string WriteUtilityDepend(cmTarget const* target);
+ virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
std::string MSDevCommand;
bool MSDevCommandInitialized;
std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,7 +152,7 @@ void
cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
const std::string& dspname,
const char* dir,
- cmTarget const& t)
+ cmGeneratorTarget const* t)
{
// check to see if this is a fortran build
const char* ext = ".vcproj";
@@ -163,7 +163,7 @@ cmGlobalVisualStudio71Generato
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-885-g23a2ea9
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 23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c (commit)
via b579e955b411029e189c6f173884ee25be3c138c (commit)
via d67b9669fd1511a4bf8f9732c37e35f7d70c60ab (commit)
via 8cb738cb008759bf5146822834130a466a0f74a1 (commit)
via d87154d0dc3881c81df8acad8275c629d48832f5 (commit)
via 7b5508df640190bc6bbd8542de6ae5eeef4300a2 (commit)
via 715a873cb5aed773241c28cfa24a490b105aca84 (commit)
via d02435b24edd127ff33f2eb9ea3075b2898ec057 (commit)
via 7d88907a36306870673898a452cfa2ee77d3ea4d (commit)
via 4ab54236e329f882a31081780645cd853ea90a63 (commit)
from 01bd45b35341d83cc4f44c0976f14883817c0351 (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=23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c
commit 23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c
Merge: 01bd45b b579e95
Author: Stephen Kelly
AuthorDate: Thu Oct 22 12:27:01 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 22 12:27:01 2015 -0400
Merge topic 'use-generator-target' into next
b579e955 Graphviz: Port to cmGeneratorTarget.
d67b9669 C::B: Port API to cmGeneratorTarget.
8cb738cb GHS: Port to cmGeneratorTarget.
d87154d0 Sublime: Port API to cmGeneratorTarget.
7b5508df Xcode: Port API to cmGeneratorTarget.
715a873c Xcode: Prefer to get target state from cmGeneratorTarget.
d02435b2 Xcode: Re-order conditions.
7d88907a Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.
4ab54236 Xcode: Port loops to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b579e955b411029e189c6f173884ee25be3c138c
commit b579e955b411029e189c6f173884ee25be3c138c
Author: Stephen Kelly
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit: Stephen Kelly
CommitDate: Thu Oct 22 18:26:32 2015 +0200
Graphviz: Port to cmGeneratorTarget.
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
{
if (!target)
{
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const
char* fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char*
fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
std::set insertedConnections;
std::set insertedNodes;
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::set& insertedConnections,
cmGeneratedFileStream& str) const
{
- std::map::const_iterator targetPtrIt =
- this->TargetPtrs.find(targetName);
+ std::map::const_iterator targetPtrIt
+ = this->TargetPtrs.find(targetName);
if (targetPtrIt == this->TargetPtrs.end()) // not found at all
{
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
const cmTarget::LinkLibraryVectorType* ll =
-&(targetPtrIt->second->GetOriginalLinkLibraries());
+ &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const
std::string& targetName,
std::set& insertedConnections,
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-828-g9d230d9
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 9d230d94b91625ed2edaae73649b0371013cf54a (commit)
via 3dce55492f97de80f455a53d5bce4178f2ae11a7 (commit)
from 7b38cda3bc92ab002b19020a1c201552d039a6fc (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=9d230d94b91625ed2edaae73649b0371013cf54a
commit 9d230d94b91625ed2edaae73649b0371013cf54a
Merge: 7b38cda 3dce554
Author: Stephen Kelly
AuthorDate: Wed Oct 21 17:20:44 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 17:20:44 2015 -0400
Merge topic 'use-generator-target' into next
3dce5549 fixup! GHS: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dce55492f97de80f455a53d5bce4178f2ae11a7
commit 3dce55492f97de80f455a53d5bce4178f2ae11a7
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:19:29 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:20:02 2015 +0200
fixup! GHS: Port to cmGeneratorTarget.
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx
b/Source/cmGlobalGhsMultiGenerator.cxx
index e260049..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
tgtsI != tgts.end(); ++tgtsI)
{
const cmGeneratorTarget *tgt = *tgtsI;
-if (IsTgtForBuild(tgt->Target))
+if (IsTgtForBuild(tgt))
{
char const *rawFolderName = tgt->GetProperty("FOLDER");
if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
GhsMultiGpj::PROJECT);
}
std::vector splitPath = cmSystemTools::SplitString(
-cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
splitPath.back());
*this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
---
Summary of changes:
Source/cmGlobalGhsMultiGenerator.cxx |4 ++--
1 file 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.4.0-rc2-826-g7b38cda
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 7b38cda3bc92ab002b19020a1c201552d039a6fc (commit)
via acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7 (commit)
via 9c9072439af6d8f16ec407789e8a1223dd7c7564 (commit)
from c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (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=7b38cda3bc92ab002b19020a1c201552d039a6fc
commit 7b38cda3bc92ab002b19020a1c201552d039a6fc
Merge: c3d33f3 acf26f0
Author: Stephen Kelly
AuthorDate: Wed Oct 21 17:17:45 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 17:17:45 2015 -0400
Merge topic 'use-generator-target' into next
acf26f03 fixup! Port to GetGeneratorTargets.
9c907243 fixup! cmLocalGenerator: Store a vector of generator targets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
commit acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:17:22 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:17:22 2015 +0200
fixup! Port to GetGeneratorTargets.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 0f39ddb..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -129,7 +129,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
for(std::vector::iterator l = tgts.begin();
l != tgts.end(); l++)
{
-cmTarget& tgt = (*l)->Target;
+cmTarget& tgt = *(*l)->Target;
if(tgt.GetType() == cmState::GLOBAL_TARGET)
{
std::vector no_depends;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9072439af6d8f16ec407789e8a1223dd7c7564
commit 9c9072439af6d8f16ec407789e8a1223dd7c7564
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:16:06 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:16:06 2015 +0200
fixup! cmLocalGenerator: Store a vector of generator targets.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 8ab2262..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
"Build all projects");
cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
- gen[0]->AddGeneratorTarget(allBuild, gt);
+ gen[0]->AddGeneratorTarget(gt);
this->AddGeneratorTarget(allBuild, gt);
#if 0
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx |2 +-
Source/cmLocalVisualStudio7Generator.cxx |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.4.0-rc1-849-gc3d33f3
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 c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (commit)
via ba75619be0d91624d2cc2451a225bb31d187be65 (commit)
via a991ddfd46c94f2743267ad572fab75936d34a10 (commit)
via 92abc662014dc135ea5af612861373c67eb94734 (commit)
from 464c0314e74dda86d3812e7022d88f516258dbf6 (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=c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
commit c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
Merge: 464c031 ba75619
Author: Stephen Kelly
AuthorDate: Wed Oct 21 16:03:20 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 16:03:20 2015 -0400
Merge topic 'use-generator-target' into next
ba75619b Graphviz: Port to cmGeneratorTarget.
a991ddfd C::B: Port API to cmGeneratorTarget.
92abc662 GHS: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba75619be0d91624d2cc2451a225bb31d187be65
commit ba75619be0d91624d2cc2451a225bb31d187be65
Author: Stephen Kelly
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 22:01:30 2015 +0200
Graphviz: Port to cmGeneratorTarget.
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
{
if (!target)
{
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const
char* fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char*
fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
std::set insertedConnections;
std::set insertedNodes;
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::set& insertedConnections,
cmGeneratedFileStream& str) const
{
- std::map::const_iterator targetPtrIt =
- this->TargetPtrs.find(targetName);
+ std::map::const_iterator targetPtrIt
+ = this->TargetPtrs.find(targetName);
if (targetPtrIt == this->TargetPtrs.end()) // not found at all
{
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
const cmTarget::LinkLibraryVectorType* ll =
-&(targetPtrIt->second->GetOriginalLinkLibraries());
+ &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const
std::string& targetName,
std::set& insertedConnections,
cmGeneratedFileStream& str) const
{
- std::map::const_iterator targetPtrIt =
- this->TargetPtrs.find(targetName);
+ std::map::const_iterator targetPtrIt
+ = this->TargetPtrs.find(targetName);
if (targetPtrIt == this->TargetPtrs.end()) // not found at all
{
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const
std::string& targetName,
std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
// now search who links against me
- for(std::map::const_iterator dependerIt =
- this->TargetPtrs.begin();
+ for(std::map::const_iterat
