[Cmake-commits] CMake branch, master, updated. v3.13.3-1160-g62c0b1a
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 62c0b1aebb827fc8a133cedfa343322d28714501 (commit) from fc96aa03f8a3d3133aaddab27bfc0b684594558b (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=62c0b1aebb827fc8a133cedfa343322d28714501 commit 62c0b1aebb827fc8a133cedfa343322d28714501 Author: Kitware Robot AuthorDate: Tue Jan 29 00:01:06 2019 -0500 Commit: Kitware Robot CommitDate: Tue Jan 29 00:01:06 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 69c2ed0..0362d52 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 13) -set(CMake_VERSION_PATCH 20190128) +set(CMake_VERSION_PATCH 20190129) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.13.3-1159-gfc96aa0
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 fc96aa03f8a3d3133aaddab27bfc0b684594558b (commit) via 939dc9a58c5667ea18809c3a5e97ef1b60eb746c (commit) from 8e495333c0914a0684d6d82e2cc15327c9f811f3 (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=fc96aa03f8a3d3133aaddab27bfc0b684594558b commit fc96aa03f8a3d3133aaddab27bfc0b684594558b Merge: 8e49533 939dc9a Author: Brad King AuthorDate: Mon Jan 28 13:45:17 2019 + Commit: Kitware Robot CommitDate: Mon Jan 28 08:45:24 2019 -0500 Merge topic 'commit-ref-in-prose' 939dc9a58c Help: prefer commit hashes in commit references Acked-by: Kitware Robot Merge-request: !2854 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=939dc9a58c5667ea18809c3a5e97ef1b60eb746c commit 939dc9a58c5667ea18809c3a5e97ef1b60eb746c Author: Ben Boeckel AuthorDate: Thu Jan 24 13:31:37 2019 -0500 Commit: Ben Boeckel CommitDate: Fri Jan 25 12:10:10 2019 -0500 Help: prefer commit hashes in commit references The logic is that the describe output is readily available using `git tag --contains` locally. In addition, for a hypothetical commit which landed in both v3.9.4 and v3.10.1, there is no "better" tag to refer to. since v3.10.0's relation to such a commit is unclear either way. Also mention that a `Fixes` trailer is preferred if the mention is just to indicate a commit which introduced an error rather than writing a complete sentence about it. diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 0c4eded..1d664c4 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -238,12 +238,10 @@ Referencing Commits in Commit Messages ^^ The preferred form for references to other commits is -``commit (, )``, where: +``commit (, )``, where: -* : - If available, a tag-relative name of the commit produced by - ``git describe --contains ``. Otherwise, the first - 8-10 characters of the commit . +* : + The abbreviated hash of the commit. * : The first line of the commit message. @@ -252,6 +250,17 @@ The preferred form for references to other commits is The author date of the commit, in its original time zone, formatted as ``CCYY-MM-DD``. ``git-log(1)`` shows the original time zone by default. +This may be generated with +``git show -s --date=short --pretty="format:%h (%s, %ad)" ``. + +If the commit is a fix for the mentioned commit, consider using a ``Fixes:`` +trailer in the commit message with the specified format. This trailer should +not be word-wrapped. Note that if there is also an issue for what is being +fixed, it is preferrable to link to the issue instead. + +If relevant, add the first release tag of CMake containing the commit after +the , i.e., ``commit (, , )``. + Alternatively, the full commit may be used. Revising Commit Messages --- Summary of changes: Help/dev/review.rst | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.13.3-1157-g8e49533
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 8e495333c0914a0684d6d82e2cc15327c9f811f3 (commit)
via ad0853b3d41bc8e0eae4f0baafab457ad52a9a7b (commit)
from f677a3d7defdb82d79bca2faf09da6d9338773b3 (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=8e495333c0914a0684d6d82e2cc15327c9f811f3
commit 8e495333c0914a0684d6d82e2cc15327c9f811f3
Merge: f677a3d ad0853b
Author: Brad King
AuthorDate: Mon Jan 28 13:36:51 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 08:36:58 2019 -0500
Merge topic 'cmake-gui-s-b'
ad0853b3d4 QtDialog: Clean up and document -S and -B options
Acked-by: Kitware Robot
Acked-by: Robert Maynard
Merge-request: !2863
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad0853b3d41bc8e0eae4f0baafab457ad52a9a7b
commit ad0853b3d41bc8e0eae4f0baafab457ad52a9a7b
Author: Kyle Edwards
AuthorDate: Fri Jan 25 10:53:18 2019 -0500
Commit: Kyle Edwards
CommitDate: Fri Jan 25 16:23:56 2019 -0500
QtDialog: Clean up and document -S and -B options
diff --git a/Help/manual/cmake-gui.1.rst b/Help/manual/cmake-gui.1.rst
index 9322e33..856aa2f 100644
--- a/Help/manual/cmake-gui.1.rst
+++ b/Help/manual/cmake-gui.1.rst
@@ -10,6 +10,7 @@ Synopsis
cmake-gui []
cmake-gui [] { | }
+ cmake-gui [] -S -B
Description
===
@@ -27,6 +28,14 @@ native tool on their platform.
Options
===
+``-S ``
+ Path to root directory of the CMake project to build.
+
+``-B ``
+ Path to directory which CMake will use as the root of build directory.
+
+ If the directory doesn't already exist CMake will make it.
+
.. include:: OPTIONS_HELP.txt
See Also
diff --git a/Help/release/dev/cmake-gui-s-b.rst
b/Help/release/dev/cmake-gui-s-b.rst
new file mode 100644
index 000..9447eb3
--- /dev/null
+++ b/Help/release/dev/cmake-gui-s-b.rst
@@ -0,0 +1,5 @@
+cmake-gui-s-b
+-
+
+* The :manual:`cmake-gui(1)` dialog gained new ``-S`` and ``-B`` arguments to
+ explicitly specify source and build directories.
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 9f4e48e..cd30ad5 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -30,7 +30,8 @@ static const char* cmDocumentationUsage[][2] = {
{ nullptr,
" cmake-gui [options]\n"
" cmake-gui [options] \n"
-" cmake-gui [options] " },
+" cmake-gui [options] \n"
+" cmake-gui [options] -S -B \n" },
{ nullptr, nullptr }
};
@@ -142,23 +143,53 @@ int main(int argc, char** argv)
CMakeSetupDialog dialog;
dialog.show();
- cmsys::CommandLineArguments arg;
- arg.Initialize(argc2, argv2);
+ QStringList args = QApplication::arguments();
std::string binaryDirectory;
std::string sourceDirectory;
- typedef cmsys::CommandLineArguments argT;
- arg.AddArgument("-B", argT::CONCAT_ARGUMENT, &binaryDirectory,
- "Binary Directory");
- arg.AddArgument("-S", argT::CONCAT_ARGUMENT, &sourceDirectory,
- "Source Directory");
- // do not complain about unknown options
- arg.StoreUnusedArguments(true);
- arg.Parse();
+ for (int i = 1; i < args.size(); ++i) {
+const QString& arg = args[i];
+if (arg.startsWith("-S")) {
+ QString path = arg.mid(2);
+ if (path.isEmpty()) {
+++i;
+if (i >= args.size()) {
+ std::cerr << "No source directory specified for -S" << std::endl;
+ return 1;
+}
+path = args[i];
+if (path[0] == '-') {
+ std::cerr << "No source directory specified for -S" << std::endl;
+ return 1;
+}
+ }
+
+ sourceDirectory =
+cmSystemTools::CollapseFullPath(path.toLocal8Bit().data());
+ cmSystemTools::ConvertToUnixSlashes(sourceDirectory);
+} else if (arg.startsWith("-B")) {
+ QString path = arg.mid(2);
+ if (path.isEmpty()) {
+++i;
+if (i >= args.size()) {
+ std::cerr << "No build directory specified for -B" << std::endl;
+ return 1;
+}
+path = args[i];
+if (path[0] == '-') {
+ std::cerr << "No build directory specified for -B" << std::endl;
+ return 1;
+}
+ }
+
+ binaryDirectory =
+cmSystemTools::CollapseFullPath(path.toLocal8Bit().data());
+ cmSystemTools::ConvertToUnixSlashes(binaryDirectory);
+}
+ }
if (!sourceDirectory.empty() && !binaryDirectory.empty()) {
dialog.setSourceDirectory(QString::fromLocal8Bit(sourceDirectory.c_str()));
dialog.setBinaryDirectory(QString::fromLocal8Bit(binaryDirectory.c_s
[Cmake-commits] CMake branch, release, updated. v3.13.3-9-gf454757
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, release has been updated via f4547578aa365164f1ef48c4f546828752cf4835 (commit) via e81fd5d5ba24e46a3a27c6a4e061932cf2022ef2 (commit) from 27eb8cc6ba96ae856c3ad12cfe0503e3d822482e (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 - --- Summary of changes: Modules/FindDoxygen.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.13.3-1155-gf677a3d
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 f677a3d7defdb82d79bca2faf09da6d9338773b3 (commit)
via c1922c9660298bb0e70204e66d596adb3d104ac0 (commit)
via f4547578aa365164f1ef48c4f546828752cf4835 (commit)
via a844c7248d7cfca9569ea8aa6a2147f564a5b2f1 (commit)
via a5098cad94c152e397b258be69ae152eb1bda3df (commit)
via e81fd5d5ba24e46a3a27c6a4e061932cf2022ef2 (commit)
from 1593e16d881bf74fd8981e1290d20f28191f1f0e (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=f677a3d7defdb82d79bca2faf09da6d9338773b3
commit f677a3d7defdb82d79bca2faf09da6d9338773b3
Merge: c1922c9 f454757
Author: Brad King
AuthorDate: Mon Jan 28 08:30:30 2019 -0500
Commit: Brad King
CommitDate: Mon Jan 28 08:30:30 2019 -0500
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1922c9660298bb0e70204e66d596adb3d104ac0
commit c1922c9660298bb0e70204e66d596adb3d104ac0
Merge: a844c72 e81fd5d
Author: Brad King
AuthorDate: Mon Jan 28 13:30:00 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 08:30:07 2019 -0500
Merge topic 'doxygen-escaping'
e81fd5d5ba FindDoxygen: Escape backslashes in default values
Acked-by: Kitware Robot
Acked-by: Julien Schueller
Merge-request: !2867
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a844c7248d7cfca9569ea8aa6a2147f564a5b2f1
commit a844c7248d7cfca9569ea8aa6a2147f564a5b2f1
Merge: 1593e16 a5098ca
Author: Brad King
AuthorDate: Mon Jan 28 13:26:45 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 08:27:03 2019 -0500
Merge topic 'cmake-E-compare_files-eol'
a5098cad94 cmake: Add --ignore-eol option to `-E compare_files` command
Acked-by: Kitware Robot
Merge-request: !2778
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5098cad94c152e397b258be69ae152eb1bda3df
commit a5098cad94c152e397b258be69ae152eb1bda3df
Author: Taylor Braun-Jones
AuthorDate: Wed Jan 9 13:02:47 2019 -0500
Commit: Brad King
CommitDate: Mon Jan 28 08:24:50 2019 -0500
cmake: Add --ignore-eol option to `-E compare_files` command
Fixes: #13007
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 915e0d4..eaf57a0 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -373,9 +373,10 @@ Available commands are:
``chdir [...]``
Change the current working directory and run a command.
-``compare_files ``
+``compare_files [--ignore-eol] ``
Check if is same as . If files are the same,
- then returns 0, if not it returns 1.
+ then returns 0, if not it returns 1. The ``--ignore-eol`` option
+ implies line-wise comparison and ignores LF/CRLF differences.
``copy ... ``
Copy files to (either file or directory).
diff --git a/Help/release/dev/compare_files-ignore-eol.rst
b/Help/release/dev/compare_files-ignore-eol.rst
new file mode 100644
index 000..bc32921
--- /dev/null
+++ b/Help/release/dev/compare_files-ignore-eol.rst
@@ -0,0 +1,6 @@
+compare_files-ignore-eol
+
+
+* The :manual:`cmake(1)` ``-E compare_files`` command learned a new
+ ``--ignore-eol`` option to specify that end-of-line differences (e.g. LF vs
+ CRLF) should be ignored when comparing files.
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index ce3691d..0ad9b88 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -78,7 +78,8 @@ void CMakeCommandUsage(const char* program)
<< " capabilities - Report capabilities built into cmake "
"in JSON format\n"
<< " chdir dir cmd [args...] - run command in a given directory\n"
-<< " compare_files file1 file2 - check if file1 is same as file2\n"
+<< " compare_files [--ignore-eol] file1 file2\n"
+<< " - check if file1 is same as file2\n"
<< " copy ... destination - copy files to destination "
"(either file or directory)\n"
<< " copy_directory ... destination - copy content of ... "
@@ -540,10 +541,20 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
}
// Compare files
-if (args[1] == "compare_files" && args.size() == 4) {
- if (cmSystemTools::FilesDiffer(args[2], args[3])) {
-std::cerr << "Files \"" << args[2] << "\" to \"" << args[3]
- << "\" are different.\n";
+if (args[1] == "compare_files" && (args.size() == 4 || args.size() == 5)) {
+ bool filesDiffer;
+ if (args.size() == 4) {
+filesDiffer = cmSystemTools::FilesDiffer(args[2], args[3]);
+ } else if (args[2] == "--ignore-eol"
[Cmake-commits] CMake branch, master, updated. v3.13.3-1149-g1593e16
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 1593e16d881bf74fd8981e1290d20f28191f1f0e (commit)
via 2a9220c34d26d33b5733ba41a25c44e02c8cdb3a (commit)
via edda30d0f5c7230b7854d8d714159ad68a2344ef (commit)
via 7a25ef326bc53293f2dd288a7c092b4080658821 (commit)
via e50a36df488be05dfbc85005c88ec8d4c5314a76 (commit)
from dc752c9d2d4bc2c0ad047689bd01bb75aa8f8fb9 (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=1593e16d881bf74fd8981e1290d20f28191f1f0e
commit 1593e16d881bf74fd8981e1290d20f28191f1f0e
Merge: dc752c9 2a9220c
Author: Brad King
AuthorDate: Mon Jan 28 13:21:32 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 08:21:50 2019 -0500
Merge topic 'get_filename_component_last_ext'
2a9220c34d Help: Add notes for topic 'get_filename_component_last_ext'
edda30d0f5 Tests: Add tests for LAST_EXT and NAME_WLE
7a25ef326b Help: Add documentation for new get_filename_component components
e50a36df48 cmGetFilenameComponentCommand: Add more components
Acked-by: Kitware Robot
Merge-request: !2853
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9220c34d26d33b5733ba41a25c44e02c8cdb3a
commit 2a9220c34d26d33b5733ba41a25c44e02c8cdb3a
Author: Brad King
AuthorDate: Mon Jan 28 08:20:24 2019 -0500
Commit: Brad King
CommitDate: Mon Jan 28 08:20:24 2019 -0500
Help: Add notes for topic 'get_filename_component_last_ext'
diff --git a/Help/release/dev/get_filename_component_last_ext.rst
b/Help/release/dev/get_filename_component_last_ext.rst
new file mode 100644
index 000..2487dbc
--- /dev/null
+++ b/Help/release/dev/get_filename_component_last_ext.rst
@@ -0,0 +1,6 @@
+get_filename_component_last_ext
+---
+
+* The :command:`get_filename_component` command gained new
+ ``LAST_EXT`` and ``NAME_WLE`` variants to work with the
+ extension after the last ``.`` in the name.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edda30d0f5c7230b7854d8d714159ad68a2344ef
commit edda30d0f5c7230b7854d8d714159ad68a2344ef
Author: Tushar Maheshwari
AuthorDate: Thu Jan 24 22:42:09 2019 +0530
Commit: Tushar Maheshwari
CommitDate: Thu Jan 24 22:42:42 2019 +0530
Tests: Add tests for LAST_EXT and NAME_WLE
diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index ac77ac3..54b858f 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -11,8 +11,10 @@ set(expect_DIRECTORY "/path/to")
set(expect_NAME "filename.ext.in")
set(expect_EXT ".ext.in")
set(expect_NAME_WE "filename")
+set(expect_LAST_EXT ".in")
+set(expect_NAME_WLE "filename.ext")
set(expect_PATH "/path/to")
-foreach(c DIRECTORY NAME EXT NAME_WE PATH)
+foreach(c DIRECTORY NAME EXT NAME_WE LAST_EXT NAME_WLE PATH)
get_filename_component(actual_${c} "${filename}" ${c})
check("${c}" "${actual_${c}}" "${expect_${c}}")
list(APPEND non_cache_vars actual_${c})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a25ef326bc53293f2dd288a7c092b4080658821
commit 7a25ef326bc53293f2dd288a7c092b4080658821
Author: Tushar Maheshwari
AuthorDate: Thu Jan 24 22:41:22 2019 +0530
Commit: Tushar Maheshwari
CommitDate: Thu Jan 24 22:41:22 2019 +0530
Help: Add documentation for new get_filename_component components
diff --git a/Help/command/get_filename_component.rst
b/Help/command/get_filename_component.rst
index 3e3c9c3..f55499a 100644
--- a/Help/command/get_filename_component.rst
+++ b/Help/command/get_filename_component.rst
@@ -15,6 +15,8 @@ Sets to a component of , where
is one of:
NAME = File name without directory
EXT = File name longest extension (.b.c from d/a.b.c)
NAME_WE = File name without directory or longest extension
+ LAST_EXT = File name last extention (.c from d/a.b.c)
+ NAME_WLE = File name without directory or last extension
PATH = Legacy alias for DIRECTORY (use for CMake <= 2.8.11)
Paths are returned with forward slashes and have no trailing slashes.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e50a36df488be05dfbc85005c88ec8d4c5314a76
commit e50a36df488be05dfbc85005c88ec8d4c5314a76
Author: Tushar Maheshwari
AuthorDate: Thu Jan 24 22:38:52 2019 +0530
Commit: Tushar Maheshwari
CommitDate: Thu Jan 24 22:38:52 2019 +0530
cmGetFilenameComponentCommand: Add more components
LAST_EXT: gets last extension from filename with multiple periods
NAME_WLE: gets the name withou
[Cmake-commits] CMake branch, release, updated. v3.13.3-7-g27eb8cc
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, release has been updated via 27eb8cc6ba96ae856c3ad12cfe0503e3d822482e (commit) via fc40bca5902e6c29197696438211265e22efa84f (commit) from 329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e (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 - --- Summary of changes: Modules/Compiler/Intel-CXX-FeatureTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.13.3-1123-g6d57201
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 6d572018687cc2b398f59519e87f17c68836b267 (commit)
via f411e936be6c5d0070c67aeb3baea150a01024a1 (commit)
via fc40bca5902e6c29197696438211265e22efa84f (commit)
via 08dee696b5831a8cba0a70df5e6b072f91d0c6f8 (commit)
from f832f15509ae269d236c0c7a5e06808b78fdaba2 (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=6d572018687cc2b398f59519e87f17c68836b267
commit 6d572018687cc2b398f59519e87f17c68836b267
Merge: f411e93 fc40bca
Author: Brad King
AuthorDate: Mon Jan 28 12:59:11 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 07:59:30 2019 -0500
Merge topic 'intel-compile-features'
fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5
Acked-by: Kitware Robot
Merge-request: !2862
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f411e936be6c5d0070c67aeb3baea150a01024a1
commit f411e936be6c5d0070c67aeb3baea150a01024a1
Merge: f832f15 08dee69
Author: Brad King
AuthorDate: Mon Jan 28 12:58:36 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 28 07:58:45 2019 -0500
Merge topic 'FindPythonInterp-version-fix'
08dee696b5 FindPythonInterp: Do not assume any version if test script fails
Acked-by: Kitware Robot
Merge-request: !2835
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc40bca5902e6c29197696438211265e22efa84f
commit fc40bca5902e6c29197696438211265e22efa84f
Author: Brad King
AuthorDate: Fri Jan 25 07:37:20 2019 -0500
Commit: Brad King
CommitDate: Fri Jan 25 07:56:37 2019 -0500
Intel: Record support for relaxed constexpr by version 18.0.5
Update the special case added by commit f719a13c28 (Features: Add
special case to disable relaxed constexpr for Intel 18, 2018-06-04,
v3.12.0-rc1~11^2) to record that 18.0.5 fixed the regression.
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index 0df6c0f..aa35b97 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -24,7 +24,7 @@ set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus
== 201103L) && !def
unset(DETECT_BUGGY_ICC15)
set(Intel17_CXX14 "__INTEL_COMPILER >= 1700 && ${DETECT_CXX14}")
-set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 ||
(${Intel17_CXX14} && __INTEL_COMPILER != 1800 && !defined(_MSC_VER))")
+set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 ||
(${Intel17_CXX14} && !(__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 5)
&& !defined(_MSC_VER))")
set(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}")
set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08dee696b5831a8cba0a70df5e6b072f91d0c6f8
commit 08dee696b5831a8cba0a70df5e6b072f91d0c6f8
Author: Marc Chevrier
AuthorDate: Mon Jan 21 16:41:59 2019 +0100
Commit: Brad King
CommitDate: Tue Jan 22 10:43:08 2019 -0500
FindPythonInterp: Do not assume any version if test script fails
The Python version is retrieved by executing a small python script. If,
for any reason, script fails to execute, leave the `PYTHON_VERSION_*`
variables undefined instead of assuming version 1.4.
Fixes: #18799
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index d1f7b31..da33301 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -130,7 +130,9 @@ if(PYTHON_EXECUTABLE)
endif()
else()
# sys.version predates sys.version_info, so use that
-execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;
sys.stdout.write(sys.version)"
+# sys.version was first documented for Python 1.5, so assume version
1.4
+# if retrieving sys.version fails.
+execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "try: import sys;
sys.stdout.write(sys.version)\nexcept: sys.stdout.write(\"1.4.0\")"
OUTPUT_VARIABLE _VERSION
RESULT_VARIABLE _PYTHON_VERSION_RESULT
ERROR_QUIET)
@@ -144,12 +146,10 @@ if(PYTHON_EXECUTABLE)
set(PYTHON_VERSION_PATCH "0")
endif()
else()
-# sys.version was first documented for Python 1.5, so assume
-# this is older.
-set(PYTHON_VERSION_STRING "1.4")
-set(PYTHON_VERSION_MAJOR "1")
-set(PYTHON_VERSION_MINOR "4")
-se
