This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via b38023f958325fedd99d5480149f4958e721fdd5 (commit)
via bb6d46d7e4f65bad099b919ffb1e34c0571ca727 (commit)
via 8732a2b3ba81d7e512d8c317b037db5caec10ee4 (commit)
via 462a320c8db91f4f646a19f34b9b41154019a68e (commit)
via 7abe332cedd2d92285233ced3cdf3ecaa3eb4803 (commit)
via fcdd6efb724439502e9e0fa95a6c0ccb4d32a5a5 (commit)
via 85d779442bbc9376a0c71f0dc8f42d0df52c11d4 (commit)
via 0794dd3018191ba919d9e8ada3ed18ad2b37eccd (commit)
via b5befac15465945d86b8c4d5603c2afd1ea29756 (commit)
via a4e01d6707e9cfe50b2f49f140c8a9894cd8108f (commit)
via 4f5bb64c5628773b95f7bd66bcb6947aacced08c (commit)
via 4dab8e69bd46b6aa85a97c4d23e9d894fc5fbcf6 (commit)
via 35bf9ded3b116209ca864eff2da481c22117e17d (commit)
via 8a95808f8fb0766197ff904bc0c47ad9afa54098 (commit)
via da846439881dbbe3697ae42fa129031cb8f467c0 (commit)
via b186329d3db0083d77e61ded709f4e70a596631d (commit)
via c489c3e7158417b1161d46555ce1c2bcb31527fc (commit)
via c048cb75fcee6b31cfacdce714b343c6623f5c9c (commit)
from 18ff514b52600a6fb37ca6fd7d38e7e3aac7129b (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=b38023f958325fedd99d5480149f4958e721fdd5
commit b38023f958325fedd99d5480149f4958e721fdd5
Merge: bb6d46d 8a95808
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 14:02:06 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 09:02:51 2019 -0500
Merge topic 'optimize-cmuuid-ctor'
8a95808f8f cmUuid: Hide UUID group info in implementation
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2976
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb6d46d7e4f65bad099b919ffb1e34c0571ca727
commit bb6d46d7e4f65bad099b919ffb1e34c0571ca727
Merge: 8732a2b c048cb7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 14:01:00 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 09:01:58 2019 -0500
Merge topic 'ninja-swift-partial'
c048cb75fc Ninja: add properties for Swift partial module and doc
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2985
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8732a2b3ba81d7e512d8c317b037db5caec10ee4
commit 8732a2b3ba81d7e512d8c317b037db5caec10ee4
Merge: 462a320 c489c3e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 14:00:52 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 09:01:00 2019 -0500
Merge topic 'once-is-enough'
c489c3e715 Ninja: remove duplicate local variable (NFC)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2986
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=462a320c8db91f4f646a19f34b9b41154019a68e
commit 462a320c8db91f4f646a19f34b9b41154019a68e
Merge: 7abe332 0794dd3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 08:56:58 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 20 08:56:58 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7abe332cedd2d92285233ced3cdf3ecaa3eb4803
commit 7abe332cedd2d92285233ced3cdf3ecaa3eb4803
Merge: fcdd6ef b5befac
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 13:55:08 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 08:55:25 2019 -0500
Merge topic 'autogen_cache_binary_checks'
b5befac154 Autogen: Use output caching GetExecutableTestOutput
a4e01d6707 Autogen: Add output caching GetExecutableTestOutput
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2990
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcdd6efb724439502e9e0fa95a6c0ccb4d32a5a5
commit fcdd6efb724439502e9e0fa95a6c0ccb4d32a5a5
Merge: 85d7794 4dab8e6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 13:54:10 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 08:54:36 2019 -0500
Merge topic 'vs-win-sdk'
4dab8e69bd VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when needed
35bf9ded3b VS: Factor out a method to set the Windows SDK version internally
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2989
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85d779442bbc9376a0c71f0dc8f42d0df52c11d4
commit 85d779442bbc9376a0c71f0dc8f42d0df52c11d4
Merge: 18ff514 b186329
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 20 13:53:33 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Feb 20 08:53:41 2019 -0500
Merge topic 'asm-no-slash-question'
b186329d3d Use -? instead of /? to test compiler for MSVC-like command-line
support
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2984
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a95808f8fb0766197ff904bc0c47ad9afa54098
commit 8a95808f8fb0766197ff904bc0c47ad9afa54098
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sat Feb 16 16:45:02 2019 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Feb 19 08:49:41 2019 -0500
cmUuid: Hide UUID group info in implementation
diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx
index 201e1cc..51ecbd1 100644
--- a/Source/cmUuid.cxx
+++ b/Source/cmUuid.cxx
@@ -4,16 +4,10 @@
#include "cmCryptoHash.h"
+#include <array>
#include <string.h>
-cmUuid::cmUuid()
-{
- Groups.push_back(4);
- Groups.push_back(2);
- Groups.push_back(2);
- Groups.push_back(2);
- Groups.push_back(6);
-}
+static const std::array<int, 5> kUuidGroups = { { 4, 2, 2, 2, 6 } };
std::string cmUuid::FromMd5(std::vector<unsigned char> const& uuidNamespace,
std::string const& name) const
@@ -83,11 +77,11 @@ bool cmUuid::StringToBinary(std::string const& input,
return false;
}
size_t index = 0;
- for (size_t i = 0; i < this->Groups.size(); ++i) {
+ for (size_t i = 0; i < kUuidGroups.size(); ++i) {
if (i != 0 && input[index++] != '-') {
return false;
}
- size_t digits = this->Groups[i] * 2;
+ size_t digits = kUuidGroups[i] * 2;
if (!StringToBinaryImpl(input.substr(index, digits), output)) {
return false;
}
@@ -103,12 +97,12 @@ std::string cmUuid::BinaryToString(const unsigned char*
input) const
std::string output;
size_t inputIndex = 0;
- for (size_t i = 0; i < this->Groups.size(); ++i) {
+ for (size_t i = 0; i < kUuidGroups.size(); ++i) {
if (i != 0) {
output += '-';
}
- size_t bytes = this->Groups[i];
+ size_t bytes = kUuidGroups[i];
for (size_t j = 0; j < bytes; ++j) {
unsigned char byte = input[inputIndex++];
output += this->ByteToHex(byte);
diff --git a/Source/cmUuid.h b/Source/cmUuid.h
index 158ce6e..7de20dd 100644
--- a/Source/cmUuid.h
+++ b/Source/cmUuid.h
@@ -15,8 +15,6 @@
class cmUuid
{
public:
- cmUuid();
-
std::string FromMd5(std::vector<unsigned char> const& uuidNamespace,
std::string const& name) const;
@@ -42,8 +40,6 @@ private:
std::string BinaryToString(const unsigned char* input) const;
bool IntFromHexDigit(char input, char& output) const;
-
- std::vector<int> Groups;
};
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c489c3e7158417b1161d46555ce1c2bcb31527fc
commit c489c3e7158417b1161d46555ce1c2bcb31527fc
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Mon Feb 18 12:07:41 2019 -0800
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Mon Feb 18 12:09:20 2019 -0800
Ninja: remove duplicate local variable (NFC)
Remove the second reference to the generator target.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index 3874f48..3784313 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -799,10 +799,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string frameworkPath;
std::string linkPath;
- cmGeneratorTarget& genTarget = *this->GetGeneratorTarget();
- std::string createRule = genTarget.GetCreateRuleVariable(
- this->TargetLinkLanguage, this->GetConfigName());
+ std::string createRule =
+ gt.GetCreateRuleVariable(this->TargetLinkLanguage, this->GetConfigName());
bool useWatcomQuote = mf->IsOn(createRule + "_USE_WATCOM_QUOTE");
cmLocalNinjaGenerator& localGen = *this->GetLocalGenerator();
@@ -815,9 +814,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
this->GetLocalGenerator()->GetStateSnapshot().GetDirectory()));
linkLineComputer->SetUseWatcomQuote(useWatcomQuote);
- localGen.GetTargetFlags(
- linkLineComputer.get(), this->GetConfigName(), vars["LINK_LIBRARIES"],
- vars["FLAGS"], vars["LINK_FLAGS"], frameworkPath, linkPath, &genTarget);
+ localGen.GetTargetFlags(linkLineComputer.get(), this->GetConfigName(),
+ vars["LINK_LIBRARIES"], vars["FLAGS"],
+ vars["LINK_FLAGS"], frameworkPath, linkPath, >);
// Add OS X version flags, if any.
if (this->GeneratorTarget->GetType() == cmStateEnums::SHARED_LIBRARY ||
@@ -838,7 +837,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
vars["LINK_PATH"] = frameworkPath + linkPath;
std::string lwyuFlags;
- if (genTarget.GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+ if (gt.GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
lwyuFlags = " -Wl,--no-as-needed";
}
@@ -847,17 +846,16 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
// code between the Makefile executable and library generators.
if (targetType == cmStateEnums::EXECUTABLE) {
std::string t = vars["FLAGS"];
- localGen.AddArchitectureFlags(t, &genTarget, TargetLinkLanguage, cfgName);
+ localGen.AddArchitectureFlags(t, >, TargetLinkLanguage, cfgName);
t += lwyuFlags;
vars["FLAGS"] = t;
} else {
std::string t = vars["ARCH_FLAGS"];
- localGen.AddArchitectureFlags(t, &genTarget, TargetLinkLanguage, cfgName);
+ localGen.AddArchitectureFlags(t, >, TargetLinkLanguage, cfgName);
vars["ARCH_FLAGS"] = t;
t.clear();
t += lwyuFlags;
- localGen.AddLanguageFlagsForLinking(t, &genTarget, TargetLinkLanguage,
- cfgName);
+ localGen.AddLanguageFlagsForLinking(t, >, TargetLinkLanguage, cfgName);
vars["LANGUAGE_COMPILE_FLAGS"] = t;
}
if (this->GetGeneratorTarget()->HasSOName(cfgName)) {
@@ -880,7 +878,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
targetOutputImplib, cmOutputConverter::SHELL);
vars["TARGET_IMPLIB"] = impLibPath;
EnsureParentDirectoryExists(impLibPath);
- if (genTarget.HasImportLibrary(cfgName)) {
+ if (gt.HasImportLibrary(cfgName)) {
byproducts.push_back(targetOutputImplib);
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c048cb75fcee6b31cfacdce714b343c6623f5c9c
commit c048cb75fcee6b31cfacdce714b343c6623f5c9c
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Mon Feb 18 11:13:39 2019 -0800
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Mon Feb 18 11:15:47 2019 -0800
Ninja: add properties for Swift partial module and doc
When building a swift object, we emit a partial swiftmodule and swiftdoc
that must be merged at the end. However, in order to do that, we need
to enumerate the swiftmodules and swiftdocs. As a result, the path must
be known to CMake. Rather than hardcoding the rules into CMake, create
a source property that we can query. This will allow us to create a
final placeholder to emit the merge rule.
Issue: #18800
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 8d2586d..6013cd0 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -455,6 +455,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
vars.SwiftAuxiliarySources = "$SWIFT_AUXILIARY_SOURCES";
vars.SwiftModuleName = "$SWIFT_MODULE_NAME";
vars.SwiftLibraryName = "$SWIFT_LIBRARY_NAME";
+ vars.SwiftPartialModule = "$SWIFT_PARTIAL_MODULE";
+ vars.SwiftPartialDoc = "$SWIFT_PARTIAL_DOC";
}
// For some cases we do an explicit preprocessor invocation.
@@ -945,6 +947,18 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
cmGeneratorTarget::Names targetNames =
this->GeneratorTarget->GetLibraryNames(this->GetConfigName());
vars["SWIFT_LIBRARY_NAME"] = targetNames.Base;
+
+ if (const char* partial = source->GetProperty("SWIFT_PARTIAL_MODULE")) {
+ vars["SWIFT_PARTIAL_MODULE"] = partial;
+ } else {
+ vars["SWIFT_PARTIAL_MODULE"] = objectFileName + ".swiftmodule";
+ }
+
+ if (const char* partial = source->GetProperty("SWIFT_PARTIAL_DOC")) {
+ vars["SWIFT_PARTIAL_DOC"] = partial;
+ } else {
+ vars["SWIFT_PARTIAL_DOC"] = objectFileName + ".swiftdoc";
+ }
}
if (!this->NeedDepTypeMSVC(language)) {
diff --git a/Source/cmRulePlaceholderExpander.cxx
b/Source/cmRulePlaceholderExpander.cxx
index 5ebdd1b..18d00b1 100644
--- a/Source/cmRulePlaceholderExpander.cxx
+++ b/Source/cmRulePlaceholderExpander.cxx
@@ -177,6 +177,16 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable(
return replaceValues.SwiftLibraryName;
}
}
+ if (replaceValues.SwiftPartialDoc) {
+ if (variable == "SWIFT_PARTIAL_DOC") {
+ return replaceValues.SwiftPartialDoc;
+ }
+ }
+ if (replaceValues.SwiftPartialModule) {
+ if (variable == "SWIFT_PARTIAL_MODULE") {
+ return replaceValues.SwiftPartialModule;
+ }
+ }
if (variable == "TARGET_SONAME" || variable == "SONAME_FLAG" ||
variable == "TARGET_INSTALLNAME_DIR") {
// All these variables depend on TargetSOName
diff --git a/Source/cmRulePlaceholderExpander.h
b/Source/cmRulePlaceholderExpander.h
index 930eafd..93d0577 100644
--- a/Source/cmRulePlaceholderExpander.h
+++ b/Source/cmRulePlaceholderExpander.h
@@ -61,6 +61,8 @@ public:
const char* SwiftAuxiliarySources;
const char* SwiftModuleName;
const char* SwiftLibraryName;
+ const char* SwiftPartialModule;
+ const char* SwiftPartialDoc;
};
// Expand rule variables in CMake of the type found in language rules
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineASMCompiler.cmake | 2 +-
Modules/CMakeDetermineCompilerId.cmake | 2 +-
Modules/CMakeDetermineVSServicePack.cmake | 2 +-
Source/cmGlobalVisualStudio14Generator.cxx | 13 +++--
Source/cmGlobalVisualStudio14Generator.h | 3 ++
Source/cmGlobalVisualStudioVersionedGenerator.cxx | 6 +++
Source/cmNinjaNormalTargetGenerator.cxx | 22 ++++----
Source/cmNinjaTargetGenerator.cxx | 14 +++++
Source/cmQtAutoGenGlobalInitializer.cxx | 64 +++++++++++++++++++++++
Source/cmQtAutoGenGlobalInitializer.h | 6 +++
Source/cmQtAutoGenInitializer.cxx | 53 +++++--------------
Source/cmQtAutoGenInitializer.h | 4 ++
Source/cmRulePlaceholderExpander.cxx | 10 ++++
Source/cmRulePlaceholderExpander.h | 2 +
Source/cmUuid.cxx | 18 +++----
Source/cmUuid.h | 4 --
16 files changed, 152 insertions(+), 73 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
