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 613ac3e7d526d3874176e2b70eba342836a9b6b5 (commit)
via d16402ddc4948a2a26ccdb9377c04d525fcb4f97 (commit)
via 369c48ee437263a9702c8725f6e73bc4b9d0fe16 (commit)
via 074a6a8cf668e748d6749ac30e58ce07179d5da8 (commit)
from 52a8fb2d532ca44ad9d995fc9c0d910177f594d2 (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=613ac3e7d526d3874176e2b70eba342836a9b6b5
commit 613ac3e7d526d3874176e2b70eba342836a9b6b5
Merge: d16402d 369c48e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 27 14:57:14 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Aug 27 10:57:26 2019 -0400
Merge topic 'swift-version'
369c48ee43 Swift: honour `-swift-version` in Ninja generator
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3685
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d16402ddc4948a2a26ccdb9377c04d525fcb4f97
commit d16402ddc4948a2a26ccdb9377c04d525fcb4f97
Merge: 52a8fb2 074a6a8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 27 14:54:15 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Aug 27 10:54:24 2019 -0400
Merge topic 'ctest-CLICOLOR_FORCE'
074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3733
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=369c48ee437263a9702c8725f6e73bc4b9d0fe16
commit 369c48ee437263a9702c8725f6e73bc4b9d0fe16
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Aug 11 18:36:06 2019 -0700
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Aug 26 11:38:40 2019 -0400
Swift: honour `-swift-version` in Ninja generator
Swift has supported `CMAKE_Swift_LANGUAGE_VERSION` and
`Swift_LANGUAGE_VERSION` but didn't apply that to Ninja generated
targets. Consider the property when calculating the flags.
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 62d23c7..def9700 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -316,6 +316,7 @@ Properties on Targets
/prop_tgt/STATIC_LIBRARY_OPTIONS
/prop_tgt/SUFFIX
/prop_tgt/Swift_DEPENDENCIES_FILE
+ /prop_tgt/Swift_LANGUAGE_VERSION
/prop_tgt/Swift_MODULE_DIRECTORY
/prop_tgt/Swift_MODULE_NAME
/prop_tgt/TYPE
diff --git a/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
b/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
new file mode 100644
index 0000000..7579447
--- /dev/null
+++ b/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
@@ -0,0 +1,6 @@
+Swift_LANGUAGE_VERSION
+----------------------
+
+This property sets the language version for the Swift sources in the target.
If
+one is not specified, it will default to ``<CMAKE_Swift_LANGUAGE_VERSION>`` if
+specified, otherwise it is the latest version supported by the compiler.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1827a42..5ee1717 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1566,6 +1566,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string&
flags,
this->AddConfigVariableFlags(flags, cmStrCat("CMAKE_", lang, "_FLAGS"),
config);
+ if (lang == "Swift") {
+ if (const char* v = target->GetProperty("Swift_LANGUAGE_VERSION")) {
+ if (cmSystemTools::VersionCompare(
+ cmSystemTools::OP_GREATER_EQUAL,
+ this->Makefile->GetDefinition("CMAKE_Swift_COMPILER_VERSION"),
+ "4.2")) {
+ this->AppendFlags(flags, "-swift-version " + std::string(v));
+ }
+ }
+ }
+
// Add MSVC runtime library flags. This is activated by the presence
// of a default selection whether or not it is overridden by a property.
const char* msvcRuntimeLibraryDefault =
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bc1b9de..e3e175a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -347,6 +347,7 @@ cmTarget::cmTarget(std::string const& name,
cmStateEnums::TargetType type,
initProp("LINK_SEARCH_START_STATIC");
initProp("LINK_SEARCH_END_STATIC");
initProp("FOLDER");
+ initProp("Swift_LANGUAGE_VERSION");
initProp("Swift_MODULE_DIRECTORY");
initProp("VS_JUST_MY_CODE_DEBUGGING");
#ifdef __APPLE__
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=074a6a8cf668e748d6749ac30e58ce07179d5da8
commit 074a6a8cf668e748d6749ac30e58ce07179d5da8
Author: Marin Baron <marin6...@gmail.com>
AuthorDate: Sat Aug 24 19:29:18 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Aug 26 11:04:57 2019 -0400
CTest: Add env var CLICOLOR_FORCE to force color output
Base impl on `Source/kwsys/Terminal.c:kwsysTerminalStreamIsVT100`.
This enables pipes/logs with colors.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 866d262..ca39a7b 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2125,6 +2125,11 @@ bool cmCTest::ColoredOutputSupportedByConsole()
return false;
#else
// On UNIX we need a non-dumb tty.
+ std::string clicolor_force;
+ if (cmSystemTools::GetEnv("CLICOLOR_FORCE", clicolor_force) &&
+ !clicolor_force.empty() && clicolor_force != "0") {
+ return true;
+ }
return ConsoleIsNotDumb();
#endif
}
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_tgt/Swift_LANGUAGE_VERSION.rst | 6 ++++++
Source/cmCTest.cxx | 5 +++++
Source/cmLocalGenerator.cxx | 11 +++++++++++
Source/cmTarget.cxx | 1 +
5 files changed, 24 insertions(+)
create mode 100644 Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
