[Cmake-commits] CMake branch, master, updated. v3.9.0-rc6-316-g2e47dee
Kitware Robot
kwrobot at kitware.com
Mon Jul 17 10:35:28 EDT 2017
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 2e47dee60a6c0bbc1eb08e9727c4c1d83dc02a3d (commit)
via 5401491648c76b61307907633502c78cd2393392 (commit)
via 94d387a970d628c14ffcbd9e6435e5a3efe94280 (commit)
via 8ff5aeb7cb7004e48a3cb2f3524b368b77db3075 (commit)
via 3ce57e3b546cb1f7aec43717ff239cd72428cc5a (commit)
via f2b05a095ab2ab12d9d82daabdc31e46d36d4fcf (commit)
via cfa9a2bd8893349516a2f5ffa51e67e6e0973d1c (commit)
via 68a64478c51ff6feb3eb939517e53ba3de850642 (commit)
via 0348383b8ccb943a68cda3ecf1bdd609212ff5ca (commit)
via 8c7facd69b63f986d8d35c22d7e40cddc7da9467 (commit)
via cef77f06878371cf7615bf4dd3da7cc3ba257878 (commit)
via 74e337117f839378e284b7edddc8484ce9c683f5 (commit)
via fca0546175edf6cae51bbf673fa379899e8c0ea6 (commit)
via 218ce158f2d9b25bc5789a28d742736129cdb088 (commit)
via 13e9a370d9567d68120396b785c5d9e91a7cc5b8 (commit)
via 221ffabfad9ed61c6c1aed8b53e5402a943477bd (commit)
from 96041907014c9d1f83dc6b2c7fbbdab8aed728ea (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=2e47dee60a6c0bbc1eb08e9727c4c1d83dc02a3d
commit 2e47dee60a6c0bbc1eb08e9727c4c1d83dc02a3d
Merge: 5401491 f2b05a0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 17 10:28:27 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 17 10:28:27 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5401491648c76b61307907633502c78cd2393392
commit 5401491648c76b61307907633502c78cd2393392
Merge: 94d387a cfa9a2b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 17 14:26:45 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 17 10:27:26 2017 -0400
Merge topic 'doc-vs2015-update-relnote'
cfa9a2bd Help: Add a 3.9 release note about the VS GenerateDebugInformation update
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1060
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94d387a970d628c14ffcbd9e6435e5a3efe94280
commit 94d387a970d628c14ffcbd9e6435e5a3efe94280
Merge: 8ff5aeb 221ffab
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 17 14:26:33 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 17 10:27:03 2017 -0400
Merge topic 'TestDriver-fix-Wconversion'
221ffabf TestDriver: Fix -Wconversion warning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1058
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ff5aeb7cb7004e48a3cb2f3524b368b77db3075
commit 8ff5aeb7cb7004e48a3cb2f3524b368b77db3075
Merge: 3ce57e3 0348383
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 17 14:26:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 17 10:26:37 2017 -0400
Merge topic 'xcode9support'
0348383b Xcode: Add "outputPaths" to custom command script build phase
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1054
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ce57e3b546cb1f7aec43717ff239cd72428cc5a
commit 3ce57e3b546cb1f7aec43717ff239cd72428cc5a
Merge: 9604190 cef77f0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 17 14:25:31 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 17 10:25:36 2017 -0400
Merge topic 'fix-lang-std-option-list'
cef77f06 Allow language extensions without any standard to use a list of options
74e33711 Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list
fca05461 cmLocalGenerator: Explain standard flag selection logic in comments
218ce158 Features: Fix support for a list of language standard options
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1059
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cef77f06878371cf7615bf4dd3da7cc3ba257878
commit cef77f06878371cf7615bf4dd3da7cc3ba257878
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 14 10:13:19 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 14 10:20:07 2017 -0400
Allow language extensions without any standard to use a list of options
Fix the logic added by commit a2112257 (Add infrastructure to use
language extensions without any standard, 2017-06-29) to support a list
of options as has been done since commit v3.9.0-rc1~174^2~2
(CompileFeatures: Let STD compile options be a list, 2016-10-05).
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f1bf664..2c5db10 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1563,7 +1563,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
"CMAKE_" + lang + "_EXTENSION_COMPILE_OPTION";
if (const char* opt =
target->Target->GetMakefile()->GetDefinition(option_flag)) {
- this->AppendFlagEscape(flags, opt);
+ std::vector<std::string> optVec;
+ cmSystemTools::ExpandListArgument(opt, optVec);
+ for (size_t i = 0; i < optVec.size(); ++i) {
+ this->AppendFlagEscape(flags, optVec[i]);
+ }
}
}
return;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74e337117f839378e284b7edddc8484ce9c683f5
commit 74e337117f839378e284b7edddc8484ce9c683f5
Merge: fca0546 218ce15
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 14 10:19:59 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 14 10:19:59 2017 -0400
Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fca0546175edf6cae51bbf673fa379899e8c0ea6
commit fca0546175edf6cae51bbf673fa379899e8c0ea6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 14 10:09:18 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 14 10:19:56 2017 -0400
cmLocalGenerator: Explain standard flag selection logic in comments
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 921be3b..2bd7e4e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1637,8 +1637,10 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
return;
}
- // Greater or equal because the standards are stored in
- // backward chronological order.
+ // If the standard requested is older than the compiler's default
+ // then we need to use a flag to change it. The comparison is
+ // greater-or-equal because the standards are stored in backward
+ // chronological order.
if (stdIt >= defaultStdIt) {
std::string option_flag =
"CMAKE_" + lang + *stdIt + "_" + type + "_COMPILE_OPTION";
@@ -1649,6 +1651,9 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
return;
}
+ // The standard requested is at least as new as the compiler's default,
+ // and the standard request is not required. Decay to the newest standard
+ // for which a flag is defined.
for (; stdIt < defaultStdIt; ++stdIt) {
std::string option_flag =
"CMAKE_" + lang + *stdIt + "_" + type + "_COMPILE_OPTION";
-----------------------------------------------------------------------
Summary of changes:
Help/release/3.9.rst | 7 +++++++
Source/cmGlobalXCodeGenerator.cxx | 11 +++++++++++
Source/cmLocalGenerator.cxx | 27 ++++++++++++++++++++++-----
Templates/TestDriver.cxx.in | 4 ++--
4 files changed, 42 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list