[Cmake-commits] CMake branch, master, updated. v3.15.3-972-gd803d6b
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 d803d6b59f294b1bd1bd32beb75468399560be95 (commit) from c52a354244086a3ad591ae01eb506ec5851bcfc2 (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=d803d6b59f294b1bd1bd32beb75468399560be95 commit d803d6b59f294b1bd1bd32beb75468399560be95 Author: Kitware Robot AuthorDate: Mon Sep 9 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Mon Sep 9 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index fd605fa..857e5f1 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190908) +set(CMake_VERSION_PATCH 20190909) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.3-971-gc52a354
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 c52a354244086a3ad591ae01eb506ec5851bcfc2 (commit) from 9aecf2e84016568d41cd199eb8a57d370f442041 (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=c52a354244086a3ad591ae01eb506ec5851bcfc2 commit c52a354244086a3ad591ae01eb506ec5851bcfc2 Author: Kitware Robot AuthorDate: Sun Sep 8 00:01:20 2019 -0400 Commit: Kitware Robot CommitDate: Sun Sep 8 00:01:20 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8565e4b..fd605fa 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190907) +set(CMake_VERSION_PATCH 20190908) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.3-970-g9aecf2e
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 9aecf2e84016568d41cd199eb8a57d370f442041 (commit) from ca8c3d64c8accebeacf322f0574494ffddb039c5 (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=9aecf2e84016568d41cd199eb8a57d370f442041 commit 9aecf2e84016568d41cd199eb8a57d370f442041 Author: Kitware Robot AuthorDate: Sat Sep 7 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Sat Sep 7 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b54dbd1..8565e4b 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190906) +set(CMake_VERSION_PATCH 20190907) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.3-969-gca8c3d6
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 ca8c3d64c8accebeacf322f0574494ffddb039c5 (commit)
via 45e90f62dd422a93b14b5ed9d49d26a51116d4fd (commit)
via 32c9ab8a1ba1dc55275aaad4285f0006ee8d4ea0 (commit)
via 5acf0de1feb83a8ec5d8f1348091501919b17cad (commit)
via 0d06cc457c2b526584c52153001d88051f6b5fbd (commit)
via 1d3f5ebb0d3da35d1b5b1287f39115b188ac5f6a (commit)
via a1ddf2d0ba6268e29a9456948828f59d044791f1 (commit)
from 7772c1db03b2424d0b8bc0f7b89e5733d2770b1d (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=ca8c3d64c8accebeacf322f0574494ffddb039c5
commit ca8c3d64c8accebeacf322f0574494ffddb039c5
Merge: 45e90f6 1d3f5eb
Author: Brad King
AuthorDate: Fri Sep 6 16:37:55 2019 +
Commit: Kitware Robot
CommitDate: Fri Sep 6 12:38:04 2019 -0400
Merge topic 'use-using'
1d3f5ebb0d clang-tidy: Enable check modernize-use-using
a1ddf2d0ba clang-tidy: Replace typedef with using
Acked-by: Kitware Robot
Merge-request: !3782
diff --cc Source/CPack/cmCPackArchiveGenerator.h
index f5be0aa,760b03d..461df66
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@@ -22,16 -22,8 +22,16 @@@ class cmCPackComponent
class cmCPackArchiveGenerator : public cmCPackGenerator
{
public:
- typedef cmCPackGenerator Superclass;
+ using Superclass = cmCPackGenerator;
+ static cmCPackGenerator* Create7ZGenerator();
+ static cmCPackGenerator* CreateTBZ2Generator();
+ static cmCPackGenerator* CreateTGZGenerator();
+ static cmCPackGenerator* CreateTXZGenerator();
+ static cmCPackGenerator* CreateTZGenerator();
+ static cmCPackGenerator* CreateTZSTGenerator();
+ static cmCPackGenerator* CreateZIPGenerator();
+
/**
* Construct generator
*/
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45e90f62dd422a93b14b5ed9d49d26a51116d4fd
commit 45e90f62dd422a93b14b5ed9d49d26a51116d4fd
Merge: 32c9ab8 5acf0de
Author: Brad King
AuthorDate: Fri Sep 6 16:35:00 2019 +
Commit: Kitware Robot
CommitDate: Fri Sep 6 12:35:49 2019 -0400
Merge topic 'simplify-AppendFlags'
5acf0de1fe cmLocalGenerator: Remove AppendFlags 'const char*' overload
Acked-by: Kitware Robot
Merge-request: !3786
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c9ab8a1ba1dc55275aaad4285f0006ee8d4ea0
commit 32c9ab8a1ba1dc55275aaad4285f0006ee8d4ea0
Merge: 7772c1d 0d06cc4
Author: Brad King
AuthorDate: Fri Sep 6 16:34:46 2019 +
Commit: Kitware Robot
CommitDate: Fri Sep 6 12:35:00 2019 -0400
Merge topic 'iwyu-freebsd-pkg'
0d06cc457c CPack/FreeBSD: Cleanup include-what-you-use diagnostics
Acked-by: Kitware Robot
Merge-request: !3785
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5acf0de1feb83a8ec5d8f1348091501919b17cad
commit 5acf0de1feb83a8ec5d8f1348091501919b17cad
Author: Brad King
AuthorDate: Thu Sep 5 10:31:56 2019 -0400
Commit: Brad King
CommitDate: Thu Sep 5 10:31:56 2019 -0400
cmLocalGenerator: Remove AppendFlags 'const char*' overload
Update call sites to ensure the `std::string` argument can be
constructed safely.
diff --git a/Source/cmCommonTargetGenerator.cxx
b/Source/cmCommonTargetGenerator.cxx
index 49db505..54443f2 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -90,7 +90,7 @@ void cmCommonTargetGenerator::AppendFortranFormatFlags(
}
if (var) {
this->LocalCommonGenerator->AppendFlags(
- flags, this->Makefile->GetDefinition(var));
+ flags, this->Makefile->GetSafeDefinition(var));
}
}
diff --git a/Source/cmLocalCommonGenerator.cxx
b/Source/cmLocalCommonGenerator.cxx
index 7c36bdc..f86955d 100644
--- a/Source/cmLocalCommonGenerator.cxx
+++ b/Source/cmLocalCommonGenerator.cxx
@@ -35,10 +35,8 @@ std::string cmLocalCommonGenerator::GetTargetFortranFlags(
std::string flags;
// Enable module output if necessary.
- if (const char* modout_flag =
-this->Makefile->GetDefinition("CMAKE_Fortran_MODOUT_FLAG")) {
-this->AppendFlags(flags, modout_flag);
- }
+ this->AppendFlags(
+flags, this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODOUT_FLAG"));
// Add a module output directory flag if necessary.
std::string mod_dir =
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e2402ad..9152e94 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1125,10 +1125,10 @@ void
cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
[Cmake-commits] CMake branch, master, updated. v3.15.3-962-g7772c1d
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 7772c1db03b2424d0b8bc0f7b89e5733d2770b1d (commit) from a2d4968ab914d5cf02457306ec8f76177a794520 (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=7772c1db03b2424d0b8bc0f7b89e5733d2770b1d commit 7772c1db03b2424d0b8bc0f7b89e5733d2770b1d Author: Kitware Robot AuthorDate: Fri Sep 6 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Fri Sep 6 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 545b0a9..b54dbd1 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190905) +set(CMake_VERSION_PATCH 20190906) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.3-961-ga2d4968
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 a2d4968ab914d5cf02457306ec8f76177a794520 (commit)
via 611eb26b9db1b0ff1e83a6983b6cdf79f2dca0d5 (commit)
from 6db8f6a410d99e9a66847530bb520b329d2f1a9e (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=a2d4968ab914d5cf02457306ec8f76177a794520
commit a2d4968ab914d5cf02457306ec8f76177a794520
Merge: 6db8f6a 611eb26
Author: Craig Scott
AuthorDate: Fri Sep 6 00:03:30 2019 +
Commit: Kitware Robot
CommitDate: Thu Sep 5 20:03:55 2019 -0400
Merge topic 'doxygen-add-docs-USE_STAMP_FILE'
611eb26b9d FindDoxygen: add USE_STAMP_FILE option
Acked-by: Kitware Robot
Merge-request: !3238
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=611eb26b9db1b0ff1e83a6983b6cdf79f2dca0d5
commit 611eb26b9db1b0ff1e83a6983b6cdf79f2dca0d5
Author: Nikita Sirgienko
AuthorDate: Tue Apr 16 14:37:45 2019 +0300
Commit: Craig Scott
CommitDate: Fri Sep 6 09:12:09 2019 +1000
FindDoxygen: add USE_STAMP_FILE option
The new option enables the behavior of only building if sources change.
diff --git a/Help/release/dev/doxygen-add-docs-USE_STAMP_FILE.rst
b/Help/release/dev/doxygen-add-docs-USE_STAMP_FILE.rst
new file mode 100644
index 000..700ee6c
--- /dev/null
+++ b/Help/release/dev/doxygen-add-docs-USE_STAMP_FILE.rst
@@ -0,0 +1,7 @@
+doxygen-add-docs-USE_STAMP_FILE
+---
+
+* The :command:`doxygen_add_docs` command from the :module:`FindDoxygen`
+ module gained a new ``USE_STAMP_FILE`` option. When this option present,
+ the custom target created by the command will only re-run Doxygen if any
+ of the source files have changed since the last successful run.
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index ebd0b24..faa03f9 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -70,6 +70,7 @@ Functions
doxygen_add_docs(targetName
[filesOrDirs...]
[ALL]
+[USE_STAMP_FILE]
[WORKING_DIRECTORY dir]
[COMMENT comment])
@@ -92,7 +93,19 @@ Functions
the :command:`add_custom_target` command used to create the custom target
internally.
- If ALL is set, the target will be added to the default build target.
+ If ``ALL`` is set, the target will be added to the default build target.
+
+ If ``USE_STAMP_FILE`` is set, the custom command defined by this function
will
+ create a stamp file with the name ``.stamp`` in the current
+ binary directory whenever doxygen is re-run. With this option present, all
+ items in must be files (i.e. no directories, symlinks or
+ wildcards) and each of the files must exist at the time
+ ``doxygen_add_docs()`` is called. An error will be raised if any of the
+ items listed is missing or is not a file when ``USE_STAMP_FILE`` is given.
+ A dependency will be created on each of the files so that doxygen will only
+ be re-run if one of the files is updated. Without the ``USE_STAMP_FILE``
+ option, doxygen will always be re-run if the target is built
+ regardless of whether anything listed in has changed.
The contents of the generated ``Doxyfile`` can be customized by setting CMake
variables before calling ``doxygen_add_docs()``. Any variable with a name of
@@ -801,7 +814,7 @@ function(doxygen_list_to_quoted_strings LIST_VARIABLE)
endfunction()
function(doxygen_add_docs targetName)
-set(_options ALL)
+set(_options ALL USE_STAMP_FILE)
set(_one_value_args WORKING_DIRECTORY COMMENT)
set(_multi_value_args)
cmake_parse_arguments(_args
@@ -978,9 +991,10 @@ doxygen_add_docs() for target ${targetName}")
endif()
# Build up a list of files we can identify from the inputs so we can list
-# them as SOURCES in the custom target (makes them display in IDEs). We
-# must do this before we transform the various DOXYGEN_... variables below
-# because we need to process DOXYGEN_INPUT as a list first.
+# them as DEPENDS and SOURCES in the custom command/target (the latter
+# makes them display in IDEs). This must be done before we transform the
+# various DOXYGEN_... variables below because we need to process
+# DOXYGEN_INPUT as a list first.
unset(_sources)
foreach(_item IN LISTS DOXYGEN_INPUT)
get_filename_component(_abs_item "${_item}" ABSOLUTE
@@ -989,11 +1003,13 @@ doxygen_add_docs() for target ${targetName}")
NOT IS_DIRECTORY "${_abs_item}" AND
NOT IS_SYMLINK "${_abs_item}")
list(APPEND _sources "${_abs_item}")
+
[Cmake-commits] CMake branch, master, updated. v3.15.3-959-g6db8f6a
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 6db8f6a410d99e9a66847530bb520b329d2f1a9e (commit) via 3beb2c440badc293c7cf783abe0f1f5e9fb6f497 (commit) from ac4d6d4a9d9b81773e61c643169cb2afe1bab644 (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=6db8f6a410d99e9a66847530bb520b329d2f1a9e commit 6db8f6a410d99e9a66847530bb520b329d2f1a9e Merge: ac4d6d4 3beb2c4 Author: Brad King AuthorDate: Thu Sep 5 13:07:22 2019 + Commit: Kitware Robot CommitDate: Thu Sep 5 09:07:30 2019 -0400 Merge topic 'doc-remove_directory-symlink' 3beb2c440b cmake: Document -E remove_directory symlink behavior Acked-by: Kitware Robot Merge-request: !3784 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3beb2c440badc293c7cf783abe0f1f5e9fb6f497 commit 3beb2c440badc293c7cf783abe0f1f5e9fb6f497 Author: Brad King AuthorDate: Thu Sep 5 08:30:09 2019 -0400 Commit: Brad King CommitDate: Thu Sep 5 08:31:49 2019 -0400 cmake: Document -E remove_directory symlink behavior Update documentation for the change made by commit e6c9a8bac3 (cmake: Teach -E remove_directory to remove directory symlinks, 2019-08-26). Also add a release note. Issue: #19533 diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 0645e41..2576cde 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -536,7 +536,8 @@ Available commands are: ``remove_directory ...`` Remove directories and their contents. If a directory does - not exist it will be silently ignored. + not exist it will be silently ignored. If is a symlink to + a directory, just the symlink will be removed. ``rename `` Rename a file or directory (on one volume). If file with the name diff --git a/Help/release/dev/remove_directory-symlink.rst b/Help/release/dev/remove_directory-symlink.rst new file mode 100644 index 000..0896388 --- /dev/null +++ b/Help/release/dev/remove_directory-symlink.rst @@ -0,0 +1,6 @@ +remove_directory-symlink + + +* The :manual:`cmake(1)` ``-E remove_directory`` command-line tool, + when given the path to a symlink to a directory, now removes just + the symlink. It no longer removes content of the linked directory. --- Summary of changes: Help/manual/cmake.1.rst | 3 ++- Help/release/dev/remove_directory-symlink.rst | 6 ++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/remove_directory-symlink.rst 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.15.3-957-gac4d6d4
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 ac4d6d4a9d9b81773e61c643169cb2afe1bab644 (commit)
via 7786a05c707dc5ffe9fdf7a6b468f56ed18c9e8a (commit)
via 1353802af366bd64ba8f730e6f93d4c416107d48 (commit)
via 8dfeb5d278625c55be1cc82399d29c0305ee4438 (commit)
via 7114c141e27532df709fcae1266bb4ce9b6e850c (commit)
from fcba9c3baa00631407f493f97afe7e9cd1b844a7 (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=ac4d6d4a9d9b81773e61c643169cb2afe1bab644
commit ac4d6d4a9d9b81773e61c643169cb2afe1bab644
Merge: fcba9c3 7786a05
Author: Brad King
AuthorDate: Thu Sep 5 12:35:29 2019 +
Commit: Kitware Robot
CommitDate: Thu Sep 5 08:36:06 2019 -0400
Merge topic 'unity-build'
7786a05c70 Unity build: Add XCode support
1353802af3 Unity build: Add unit tests
8dfeb5d278 Unity build: Add support for Visual Studio generator
7114c141e2 Unity build: Add support for Ninja and Makefile generators
Acked-by: Kitware Robot
Acked-by: Stanislav Ershov
Acked-by: Evgeniy Dushistov
Acked-by: Viktor Kirilov
Merge-request: !3611
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7786a05c707dc5ffe9fdf7a6b468f56ed18c9e8a
commit 7786a05c707dc5ffe9fdf7a6b468f56ed18c9e8a
Author: Cristian Adam
AuthorDate: Tue Jul 30 18:31:16 2019 +0200
Commit: Cristian Adam
CommitDate: Fri Aug 30 20:39:37 2019 +0200
Unity build: Add XCode support
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 427ab44..74d97e1 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2839,6 +2839,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(
continue;
}
+ generator->AddUnityBuild(gtgt, "");
generator->AddPchDependencies(gtgt, "");
auto addSourceToGroup = [this, mf, gtgt,
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6249c28..c85ee2d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2266,7 +2266,11 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget*
target,
for (; begin != end; ++begin) {
cmSourceFile* sf = filtered_sources[begin];
- if (!this->GetGlobalGenerator()->IsMultiConfig()) {
+ // Only in Visual Studio generator we keep the source files
+ // for explicit processing. For the rest the source files will
+ // not be included in the project.
+ if (!this->GetGlobalGenerator()->IsMultiConfig() ||
+ this->GetGlobalGenerator()->IsXcode()) {
sf->SetProperty("HEADER_FILE_ONLY", "ON");
}
sf->SetProperty("UNITY_SOURCE_FILE", filename.c_str());
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1353802af366bd64ba8f730e6f93d4c416107d48
commit 1353802af366bd64ba8f730e6f93d4c416107d48
Author: Cristian Adam
AuthorDate: Mon Jul 29 19:33:55 2019 +0200
Commit: Cristian Adam
CommitDate: Fri Aug 30 20:39:32 2019 +0200
Unity build: Add unit tests
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 48eebcc..8fd5234 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -576,3 +576,4 @@ endif()
add_RunCMake_test("CTestCommandExpandLists")
add_RunCMake_test(PrecompileHeaders)
+add_RunCMake_test("UnityBuild")
diff --git a/Tests/RunCMake/UnityBuild/CMakeLists.txt
b/Tests/RunCMake/UnityBuild/CMakeLists.txt
new file mode 100644
index 000..77030d6
--- /dev/null
+++ b/Tests/RunCMake/UnityBuild/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.15)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake
b/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake
new file mode 100644
index 000..8e484d0
--- /dev/null
+++ b/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake
@@ -0,0 +1,23 @@
+include(RunCMake)
+
+run_cmake(unitybuild_c)
+run_cmake(unitybuild_cxx)
+run_cmake(unitybuild_c_and_cxx)
+run_cmake(unitybuild_batchsize)
+run_cmake(unitybuild_default_batchsize)
+run_cmake(unitybuild_skip)
+run_cmake(unitybuild_code_before_and_after_include)
+run_cmake(unitybuild_c_no_unity_build)
+run_cmake(unitybuild_order)
+
+function(run_test name)
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${name}-build)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ run_cmake(${name})
+ run_cmake_command(${name}-build ${CMAKE_COMMAND} --build . --config Debug)
+ run_cmake_command(${name}-test ${CMAKE_CTEST_COMMAND} -C Debug)
+ unset(RunCMake_TEST_BINARY_DIR)
+
[Cmake-commits] CMake branch, master, updated. v3.15.3-952-gfcba9c3
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 fcba9c3baa00631407f493f97afe7e9cd1b844a7 (commit)
via e26f0e9dd58b839b880670d6000e7f1ebac1df94 (commit)
via f7085d7b0a0d4cced41669b498a3d03c4a1e65df (commit)
from f545428be08531d2561feba4854793775be83c39 (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=fcba9c3baa00631407f493f97afe7e9cd1b844a7
commit fcba9c3baa00631407f493f97afe7e9cd1b844a7
Merge: f545428 e26f0e9
Author: Brad King
AuthorDate: Thu Sep 5 12:24:38 2019 +
Commit: Kitware Robot
CommitDate: Thu Sep 5 08:24:50 2019 -0400
Merge topic 'cpack-zstd'
e26f0e9dd5 CPack: Add generator for .tar.zst packages
f7085d7b0a cmCPackArchiveGenerator: Code cleanup
Acked-by: Kitware Robot
Merge-request: !3752
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e26f0e9dd58b839b880670d6000e7f1ebac1df94
commit e26f0e9dd58b839b880670d6000e7f1ebac1df94
Author: Regina Pfeifer
AuthorDate: Wed Aug 28 22:05:45 2019 +0200
Commit: Brad King
CommitDate: Wed Sep 4 13:05:22 2019 -0400
CPack: Add generator for .tar.zst packages
diff --git a/Help/cpack_gen/archive.rst b/Help/cpack_gen/archive.rst
index b288aad..d455f4b 100644
--- a/Help/cpack_gen/archive.rst
+++ b/Help/cpack_gen/archive.rst
@@ -9,6 +9,7 @@ different formats:
- TGZ (.tar.gz)
- TXZ (.tar.xz)
- TZ (.tar.Z)
+ - TZST (.tar.zst)
- ZIP (.zip)
Variables specific to CPack Archive generator
diff --git a/Help/release/dev/cpack-zstd.rst b/Help/release/dev/cpack-zstd.rst
new file mode 100644
index 000..e1e64a2
--- /dev/null
+++ b/Help/release/dev/cpack-zstd.rst
@@ -0,0 +1,5 @@
+cpack-zstd
+--
+
+* The :cpack_gen:`CPack Archive Generator` learned to generate `.tar.zst`
+ packages with Zstandard compression.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index e9338f2..1271b08 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -46,6 +46,12 @@ cmCPackGenerator*
cmCPackArchiveGenerator::CreateTZGenerator()
".tar.Z");
}
+cmCPackGenerator* cmCPackArchiveGenerator::CreateTZSTGenerator()
+{
+ return new cmCPackArchiveGenerator(cmArchiveWrite::CompressZstd, "paxr",
+ ".tar.zst");
+}
+
cmCPackGenerator* cmCPackArchiveGenerator::CreateZIPGenerator()
{
return new cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "zip",
diff --git a/Source/CPack/cmCPackArchiveGenerator.h
b/Source/CPack/cmCPackArchiveGenerator.h
index 9bd1ede..f5be0aa 100644
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@ -29,6 +29,7 @@ public:
static cmCPackGenerator* CreateTGZGenerator();
static cmCPackGenerator* CreateTXZGenerator();
static cmCPackGenerator* CreateTZGenerator();
+ static cmCPackGenerator* CreateTZSTGenerator();
static cmCPackGenerator* CreateZIPGenerator();
/**
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx
b/Source/CPack/cmCPackGeneratorFactory.cxx
index f230871..4d41049 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -54,6 +54,8 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
cmCPackArchiveGenerator::CreateTXZGenerator);
this->RegisterGenerator("TZ", "Tar Compress compression",
cmCPackArchiveGenerator::CreateTZGenerator);
+this->RegisterGenerator("TZST", "Tar Zstandard compression",
+cmCPackArchiveGenerator::CreateTZSTGenerator);
this->RegisterGenerator("ZIP", "ZIP file format",
cmCPackArchiveGenerator::CreateZIPGenerator);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7085d7b0a0d4cced41669b498a3d03c4a1e65df
commit f7085d7b0a0d4cced41669b498a3d03c4a1e65df
Author: Regina Pfeifer
AuthorDate: Wed Aug 28 21:36:38 2019 +0200
Commit: Brad King
CommitDate: Wed Sep 4 13:05:22 2019 -0400
cmCPackArchiveGenerator: Code cleanup
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 2ff6c8c..decb39a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -978,12 +978,6 @@ set(CPACK_SRCS
CPack/cmCPackNSISGenerator.cxx
CPack/cmCPackNuGetGenerator.cxx
CPack/cmCPackSTGZGenerator.cxx
- CPack/cmCPackTGZGenerator.cxx
- CPack/cmCPackTXZGenerator.cxx
- CPack/cmCPackTarBZip2Generator.cxx
- CPack/cmCPackTarCompressGenerator.cxx
- CPack/cmCPackZIPGenerator.cxx
- CPack/cmCPack7zGenerator.cxx
)
# CPack
[Cmake-commits] CMake branch, master, updated. v3.15.3-949-gf545428
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 f545428be08531d2561feba4854793775be83c39 (commit) from ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (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=f545428be08531d2561feba4854793775be83c39 commit f545428be08531d2561feba4854793775be83c39 Author: Kitware Robot AuthorDate: Thu Sep 5 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Thu Sep 5 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 5f6e9bb..545b0a9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190904) +set(CMake_VERSION_PATCH 20190905) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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 annotated tag, v3.15.3, created. v3.15.3
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 annotated tag, v3.15.3 has been created at 842f4e2244ec87b814624c97be6456b3d68d3f6c (tag) tagging 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) replaces v3.15.2 tagged by Brad King on Wed Sep 4 10:56:34 2019 -0400 - Log - CMake 3.15.3 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl1v0KIWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhJf0D/9unhBq9FGp2DD/kjXBfJFmMkyC ABguTSYX/guCHDHTMlBQx01r+fllpAihFg8m/XrU3fOuBJRLHHbMEn5WR9EmXaRq UgKYfc5f0B2DUf0bFAf1v0QLtpZgleipd26wOSloWjs94tBn6o9IV2UdBpxs9b5U Ay7IG7DPuJqFRqocuZVC9iS/H0uZ6n8kg/0patgqL2hv/wE9KVPIZAng9TVQA5hz tQEv419gpvRqA3Wgpoj/+oFgS3EcrVymaIQKE478cqnVd5WmdoP84lnDYbC7DCXe IjBlGbNPo1CTTzQ6glvzmanWRFe4fgmMrJ/nSOS09h78DZMUyPTrbTpctb3s/7e1 tvbejZgrrH+R3TJvNh4ZR2l05g3Vy9m2HQYUaPXP1viGQD3u6ymXCUqx/iQt19CG xGZFXqQR5IRAozjrZ6KNgJ/UG1ZwXwBhPeW4XNSBE/PRXoW4U8tGvwou7gCnZORg 1i7I1ABweIaU0mwk8LF3++Hv5vkcj9LsiC7TgCW8xjEhVbONTwsuUpkAXTz2VtKq Ekgk0+p5vXsiiSpUvnCOPFURk2eDJVhVXOlsY8ybnQ6ae8Ewwgoxk+W+Oa2aZ8B2 45STj193kGoWzXboBHGeIulHnvmmrxkwoXwun+oNIZm5Hc0s4n9a2ZHgpngUx+lo idvR++raJrI7BAc1Ww== =gzq0 -END PGP SIGNATURE- Brad King (27): Flang: Implement MSVC runtime library abstraction Merge branch 'msvc-runtime-library-flang' into release-3.15 Merge branch 'ccmake-crash-on-empty-strings-property' into release-3.15 Merge branch 'FindMPI-restore-flag-vars' into release-3.15 Merge branch 'CrayPrgEnv-update-link-type-detection' into release-3.15 CTest: Fix --show-only=json-v1 output with REQUIRED_FILES property Merge branch 'ctest-json-REQUIRED_FILES' into release-3.15 cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime cmAffinity: Add include for CPU_ZERO on Alpine Linux Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15 Merge branch 'libarchive-requirement' into release-3.15 Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15 Merge branch 'alpine-cpu_zero' into release-3.15 Merge branch 'autogen_fix_use_after_move' into release-3.15 find_path: Fix crash on empty old-style list of names Merge branch 'backport-find-no-name' into release-3.15 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior Merge branch 'fileapi-CMP0037-OLD' into release-3.15 FindBoost: Simplify conditional block for last known version FindBoost: Remove incorrect 1.70 timer dependency FindBoost: Unwrap compatibility INTERFACE targets for legacy variables FindBoost: Add support for Boost 1.71 Merge branch 'FindBoost-1.71' into release-3.15 FindBoost: Clarify role of legacy variables in warning message FindBoost: Tolerate future Boost INTERFACE libraries Merge branch 'FindBoost-1.71' into release-3.15 CMake 3.15.3 Chuck Atkins (1): CrayPrgEnv: Change default linking mode based on PE version M Furkan USLU (1): ccmake: handle cache entries with empty STRINGS property Marvin Schmidt (1): libarchive: We now require at least version 3.3.3 Robert Maynard (1): FindMPI: Restore MPI__COMPILE_FLAGS and MPI__COMPILE_OPTIONS Sebastian Holtermann (3): Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets Tests: Extend MakeClean test to test various target types Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.2-34-g26a0e20
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 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) from 7a8bd12926c32f709cc162ba931484c1b5820363 (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: 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.15.2-982-gee15bc7
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 ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (commit) via 26a0e200e5f4abe8268235c9fdb23a2612a1b3b1 (commit) from aef152b91d9f56af87ca2b9618f07228e5f3c463 (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=ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 commit ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 Merge: aef152b 26a0e20 Author: Brad King AuthorDate: Wed Sep 4 10:36:51 2019 -0400 Commit: Brad King CommitDate: Wed Sep 4 10:36:51 2019 -0400 Merge branch 'release-3.15' --- Summary of changes: 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.15.2-980-gaef152b
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 aef152b91d9f56af87ca2b9618f07228e5f3c463 (commit) via 790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 (commit) via 7a8bd12926c32f709cc162ba931484c1b5820363 (commit) via 907d3ed824d8b82525c687747662b358accded9c (commit) via 2d357b7a682070fc98f520212d82efa821fc821c (commit) from 09032f09f8d2b4f7af658060ef434083f9d6a0d4 (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=aef152b91d9f56af87ca2b9618f07228e5f3c463 commit aef152b91d9f56af87ca2b9618f07228e5f3c463 Merge: 790db8d 7a8bd12 Author: Brad King AuthorDate: Wed Sep 4 09:43:43 2019 -0400 Commit: Brad King CommitDate: Wed Sep 4 09:43:43 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 commit 790db8d477cfaf10b227d6d7a7ca2c0d7d8aaf62 Merge: 09032f0 907d3ed Author: Brad King AuthorDate: Wed Sep 4 13:43:07 2019 + Commit: Kitware Robot CommitDate: Wed Sep 4 09:43:18 2019 -0400 Merge topic 'FindBoost-1.71' 907d3ed824 FindBoost: Tolerate future Boost INTERFACE libraries 2d357b7a68 FindBoost: Clarify role of legacy variables in warning message Acked-by: Kitware Robot Merge-request: !3780 --- Summary of changes: Modules/FindBoost.cmake | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.2-33-g7a8bd12
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 7a8bd12926c32f709cc162ba931484c1b5820363 (commit) via 907d3ed824d8b82525c687747662b358accded9c (commit) via 2d357b7a682070fc98f520212d82efa821fc821c (commit) from 3b8fa496e7a9482cb4592e9f36b54f5b1bc3cdea (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/FindBoost.cmake | 24 +++- 1 file changed, 15 insertions(+), 9 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.15.2-975-g09032f0
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 09032f09f8d2b4f7af658060ef434083f9d6a0d4 (commit)
via 7b50b05aa9f162388fc9f57899baffdafad7d4af (commit)
via 62e5f722899cfa7c51791be7697c9030aee3a19b (commit)
via 383bf3b5e7609621719a8923b65d003087789e98 (commit)
from efbd50383386c00cde63a7b67672b8487b00980f (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=09032f09f8d2b4f7af658060ef434083f9d6a0d4
commit 09032f09f8d2b4f7af658060ef434083f9d6a0d4
Merge: 7b50b05 383bf3b
Author: Brad King
AuthorDate: Wed Sep 4 12:53:49 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:53:59 2019 -0400
Merge topic 'pch-fix-vs-test'
383bf3b5e7 Precompile Headers: Fix Visual Studio 10 unit test
Acked-by: Kitware Robot
Merge-request: !3770
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b50b05aa9f162388fc9f57899baffdafad7d4af
commit 7b50b05aa9f162388fc9f57899baffdafad7d4af
Merge: efbd503 62e5f72
Author: Brad King
AuthorDate: Wed Sep 4 12:52:32 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:52:45 2019 -0400
Merge topic 'tidy-use-using'
62e5f72289 clang-tidy: Replace typedef with using
Acked-by: Kitware Robot
Merge-request: !3731
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62e5f722899cfa7c51791be7697c9030aee3a19b
commit 62e5f722899cfa7c51791be7697c9030aee3a19b
Author: Regina Pfeifer
AuthorDate: Fri Aug 23 23:25:56 2019 +0200
Commit: Brad King
CommitDate: Tue Sep 3 13:21:26 2019 -0400
clang-tidy: Replace typedef with using
diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx
b/Source/CPack/cmCPackFreeBSDGenerator.cxx
index a35977c..bbba8a1 100644
--- a/Source/CPack/cmCPackFreeBSDGenerator.cxx
+++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx
@@ -131,7 +131,7 @@ public:
class ManifestKeyListValue : public ManifestKey
{
public:
- typedef std::vector VList;
+ using VList = std::vector;
VList value;
ManifestKeyListValue(const std::string& k)
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 69dac88..b4b320d 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -157,7 +157,7 @@ int main(int argc, char const* const* argv)
cmsys::CommandLineArguments arg;
arg.Initialize(argc, argv);
- typedef cmsys::CommandLineArguments argT;
+ using argT = cmsys::CommandLineArguments;
// Help arguments
arg.AddArgument("--help", argT::NO_ARGUMENT, , "CPack help");
arg.AddArgument("--help-full", argT::SPACE_ARGUMENT, ,
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx
index b957856..52dc0ac 100644
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@@ -200,8 +200,8 @@ public:
private:
cmCTestBZR* BZR;
- typedef cmCTestBZR::Revision Revision;
- typedef cmCTestBZR::Change Change;
+ using Revision = cmCTestBZR::Revision;
+ using Change = cmCTestBZR::Change;
Revision Rev;
std::vector Changes;
Change CurChange;
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index 560c169..b9b90c8 100644
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/Source/CTest/cmCTestCVS.cxx
@@ -105,7 +105,7 @@ bool cmCTestCVS::UpdateImpl()
class cmCTestCVS::LogParser : public cmCTestVC::LineParser
{
public:
- typedef cmCTestCVS::Revision Revision;
+ using Revision = cmCTestCVS::Revision;
LogParser(cmCTestCVS* cvs, const char* prefix, std::vector& revs)
: CVS(cvs)
, Revisions(revs)
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index f7319ef..3ae464d 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -333,7 +333,7 @@ public:
this->SetLog(>Log, prefix);
}
- typedef cmCTestGIT::Change Change;
+ using Change = cmCTestGIT::Change;
std::vector Changes;
protected:
@@ -456,7 +456,7 @@ public:
}
private:
- typedef cmCTestGIT::Revision Revision;
+ using Revision = cmCTestGIT::Revision;
enum SectionType
{
SectionHeader,
diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx
index ba2252a..297077e 100644
--- a/Source/CTest/cmCTestHG.cxx
+++ b/Source/CTest/cmCTestHG.cxx
@@ -174,8 +174,8 @@ public:
private:
cmCTestHG* HG;
- typedef cmCTestHG::Revision Revision;
- typedef cmCTestHG::Change Change;
+ using Revision = cmCTestHG::Revision;
+ using Change = cmCTestHG::Change;
Revision Rev;
std::vector Changes;
Change CurChange;
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 64354e8..9bca7cb 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
[Cmake-commits] CMake branch, master, updated. v3.15.2-971-gefbd503
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 efbd50383386c00cde63a7b67672b8487b00980f (commit)
via fb9da8e6f421263e8904e8d12586bf7b068ed3b4 (commit)
from 2b478a921aedd55c2596bc0cb083ffea7244bb0e (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=efbd50383386c00cde63a7b67672b8487b00980f
commit efbd50383386c00cde63a7b67672b8487b00980f
Merge: 2b478a9 fb9da8e
Author: Brad King
AuthorDate: Wed Sep 4 12:49:44 2019 +
Commit: Kitware Robot
CommitDate: Wed Sep 4 08:50:19 2019 -0400
Merge topic 'fortran-INCLUDE-defines'
fb9da8e6f4 Ninja: Pass preprocessor definitions when compiling with Intel
Fortran
Acked-by: Kitware Robot
Merge-request: !3764
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb9da8e6f421263e8904e8d12586bf7b068ed3b4
commit fb9da8e6f421263e8904e8d12586bf7b068ed3b4
Author: Brad King
AuthorDate: Fri Aug 30 15:30:51 2019 -0400
Commit: Brad King
CommitDate: Tue Sep 3 14:20:26 2019 -0400
Ninja: Pass preprocessor definitions when compiling with Intel Fortran
The Intel Fortran compiler supports an extension that allows conditional
compilation based on preprocessor definitions specified on the command
line even when not preprocessing.
Fixes: #19664
diff --git a/Modules/Compiler/Intel-Fortran.cmake
b/Modules/Compiler/Intel-Fortran.cmake
index 5275ddf..156b533 100644
--- a/Modules/Compiler/Intel-Fortran.cmake
+++ b/Modules/Compiler/Intel-Fortran.cmake
@@ -8,6 +8,8 @@ set(CMAKE_Fortran_MODDIR_FLAG "-module ")
set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
+set(CMAKE_Fortran_COMPILE_WITH_DEFINES 1)
+
set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "
-E > ")
set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE "
-S -o ")
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 29e8b74..90b59e7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -108,6 +108,13 @@ bool cmNinjaTargetGenerator::UsePreprocessedSource(
return lang == "Fortran";
}
+bool cmNinjaTargetGenerator::CompilePreprocessedSourceWithDefines(
+ std::string const& lang) const
+{
+ return this->Makefile->IsOn(
+cmStrCat("CMAKE_", lang, "_COMPILE_WITH_DEFINES"));
+}
+
std::string cmNinjaTargetGenerator::LanguageDyndepRule(
const std::string& lang) const
{
@@ -458,12 +465,14 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
vars.ObjectDir = "$OBJECT_DIR";
vars.ObjectFileDir = "$OBJECT_FILE_DIR";
+ cmMakefile* mf = this->GetMakefile();
+
// For some cases we do an explicit preprocessor invocation.
bool const explicitPP = this->NeedExplicitPreprocessing(lang);
+ bool const compilePPWithDefines = this->UsePreprocessedSource(lang) &&
+this->CompilePreprocessedSourceWithDefines(lang);
bool const needDyndep = this->NeedDyndep(lang);
- cmMakefile* mf = this->GetMakefile();
-
std::string flags = "$FLAGS";
std::string responseFlag;
@@ -517,9 +526,14 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
// Preprocessing and compilation use the same flags.
std::string ppFlags = flags;
-// Move preprocessor definitions to the preprocessor rule.
-ppVars.Defines = vars.Defines;
-vars.Defines = "";
+if (!compilePPWithDefines) {
+ // Move preprocessor definitions to the preprocessor rule.
+ ppVars.Defines = vars.Defines;
+ vars.Defines = "";
+} else {
+ // Copy preprocessor definitions to the preprocessor rule.
+ ppVars.Defines = vars.Defines;
+}
// Copy include directories to the preprocessor rule. The Fortran
// compilation rule still needs them for the INCLUDE directive.
@@ -1011,6 +1025,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
ppBuild.RspFile = ppFileName + ".rsp";
bool const compilePP = this->UsePreprocessedSource(language);
+bool const compilePPWithDefines =
+ compilePP && this->CompilePreprocessedSourceWithDefines(language);
if (compilePP) {
// Move compilation dependencies to the preprocessing build statement.
std::swap(ppBuild.ExplicitDeps, objBuild.ExplicitDeps);
@@ -1039,7 +1055,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
this->LocalGenerator->AppendFlags(vars["FLAGS"], postFlag);
}
-if (compilePP) {
+if (compilePP && !compilePPWithDefines) {
// Move preprocessor definitions to the preprocessor build statement.
std::swap(ppBuild.Variables["DEFINES"],
[Cmake-commits] CMake branch, master, updated. v3.15.2-969-g2b478a9
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 2b478a921aedd55c2596bc0cb083ffea7244bb0e (commit) via b96155f228a6f5fd1af263a927d35e3683a58766 (commit) from 787765d4025cd1caa842d9bcfcf6cd71222b9d44 (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=2b478a921aedd55c2596bc0cb083ffea7244bb0e commit 2b478a921aedd55c2596bc0cb083ffea7244bb0e Merge: 787765d b96155f Author: Brad King AuthorDate: Wed Sep 4 12:34:53 2019 + Commit: Kitware Robot CommitDate: Wed Sep 4 08:35:11 2019 -0400 Merge topic 'fix-copy-directory-docs' b96155f228 Help: Fix copy_directory description Acked-by: Kitware Robot Merge-request: !3769 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b96155f228a6f5fd1af263a927d35e3683a58766 commit b96155f228a6f5fd1af263a927d35e3683a58766 Author: Leonid Pospelov AuthorDate: Mon Sep 2 15:21:16 2019 +0300 Commit: Leonid Pospelov CommitDate: Mon Sep 2 15:21:16 2019 +0300 Help: Fix copy_directory description diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 26ef904..0645e41 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -462,7 +462,7 @@ Available commands are: but the files or directories it point to. ``copy_directory ... `` - Copy directories to directory. + Copy content of ``...`` directories to directory. If directory does not exist it will be created. ``copy_directory`` does follow symlinks. --- Summary of changes: Help/manual/cmake.1.rst | 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.15.2-967-g787765d
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 787765d4025cd1caa842d9bcfcf6cd71222b9d44 (commit) from 711e1c3ada26d952fa6360e671379b7bf1be2f17 (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=787765d4025cd1caa842d9bcfcf6cd71222b9d44 commit 787765d4025cd1caa842d9bcfcf6cd71222b9d44 Author: Kitware Robot AuthorDate: Wed Sep 4 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Wed Sep 4 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 46f7cce..5f6e9bb 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190903) +set(CMake_VERSION_PATCH 20190904) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-966-g711e1c3
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 711e1c3ada26d952fa6360e671379b7bf1be2f17 (commit) via de0a2354fcd2f97b1a8f7ec98b4b623e76d88c2c (commit) via 1aa0a18c41eb6b8dbfc9130eb975fa9ecd6b680c (commit) from 72b7629956c1718ce59db8a6a0d485b166ed6fe0 (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=711e1c3ada26d952fa6360e671379b7bf1be2f17 commit 711e1c3ada26d952fa6360e671379b7bf1be2f17 Merge: 72b7629 de0a235 Author: Brad King AuthorDate: Tue Sep 3 17:16:05 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 13:16:17 2019 -0400 Merge topic 'lint-updates' de0a2354fc IWYU: Add missing cstddef includes for size_t and nullptr_t 1aa0a18c41 cmCTestTestHandler: Re-order includes to follow our convention Acked-by: Kitware Robot Merge-request: !3774 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de0a2354fcd2f97b1a8f7ec98b4b623e76d88c2c commit de0a2354fcd2f97b1a8f7ec98b4b623e76d88c2c Author: Brad King AuthorDate: Tue Sep 3 11:41:40 2019 -0400 Commit: Brad King CommitDate: Tue Sep 3 11:46:52 2019 -0400 IWYU: Add missing cstddef includes for size_t and nullptr_t The IWYU tool we use for CI now diagnoses these. diff --git a/Source/CPack/IFW/cmCPackIFWCommon.cxx b/Source/CPack/IFW/cmCPackIFWCommon.cxx index f9ce822..aa9a457 100644 --- a/Source/CPack/IFW/cmCPackIFWCommon.cxx +++ b/Source/CPack/IFW/cmCPackIFWCommon.cxx @@ -11,6 +11,7 @@ #include "cmVersionConfig.h" #include "cmXMLWriter.h" +#include #include #include #include diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 547d2f3..b90209e 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx index 5d9181a..8161191 100644 --- a/Source/cmFileAPI.cxx +++ b/Source/cmFileAPI.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index b9a9204..8896e15 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5,6 +5,7 @@ #include "cmsys/RegularExpression.hxx" #include #include +#include #include #include #include diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 91dea58..d2c051e 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -5,6 +5,7 @@ #include "cmsys/RegularExpression.hxx" #include #include +#include #include #include #include diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index f8c5ada..e74fff6 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -4,6 +4,7 @@ #include "cmsys/RegularExpression.hxx" #include +#include #include #include #include diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 155167b..d6916b0 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -29,6 +29,7 @@ #include "cmsys/SystemInformation.hxx" #include +#include #include #include #include diff --git a/Source/cmString.hxx b/Source/cmString.hxx index 49bad78..226ac67 100644 --- a/Source/cmString.hxx +++ b/Source/cmString.hxx @@ -9,6 +9,7 @@ #include "cm_string_view.hxx" #include +#include #include #include #include diff --git a/Source/cmStringAlgorithms.cxx b/Source/cmStringAlgorithms.cxx index c686aa0..131a01e 100644 --- a/Source/cmStringAlgorithms.cxx +++ b/Source/cmStringAlgorithms.cxx @@ -3,6 +3,7 @@ #include "cmStringAlgorithms.h" #include +#include #include #include #include diff --git a/Source/cmUVProcessChain.h b/Source/cmUVProcessChain.h index 75f8f66..76a9c40 100644 --- a/Source/cmUVProcessChain.h +++ b/Source/cmUVProcessChain.h @@ -6,6 +6,7 @@ #include "cm_uv.h" #include +#include #include #include #include diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h index 512e103..a5b06af 100644 --- a/Source/cmXMLWriter.h +++ b/Source/cmXMLWriter.h @@ -8,6 +8,7 @@ #include "cmXMLSafe.h" #include +#include #include #include #include diff --git a/Tests/CMakeLib/testString.cxx b/Tests/CMakeLib/testString.cxx index af5e41e..075892f 100644 --- a/Tests/CMakeLib/testString.cxx +++ b/Tests/CMakeLib/testString.cxx @@ -6,6 +6,7 @@ #include "cm_static_string_view.hxx" #include "cm_string_view.hxx" +#include #include #include #include
[Cmake-commits] CMake branch, master, updated. v3.15.2-958-g1f7bd00
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 1f7bd0032253296413770567a90a0a88b6cccb34 (commit) via c4f2f011084a5e64e6f3745071ea56a286758682 (commit) via 4684e64c84d49d9152ebab42c8bc4ffa57652041 (commit) via 54b69bd6426bffae6ba11b4d0d95a4ad8c31b309 (commit) via cee20ad5374e2547cad9f2847006cf753c301042 (commit) via d8e323761152dcf494606ca3436637a9cbbe1741 (commit) via dca9c33abc7ce6b041b378e1ebc43c35327027b3 (commit) via c856d4556b4ec28cb818ef3c7aca1e4a30e0499d (commit) via aaf24357802f577830659a441fdf41da83642b43 (commit) via 10507c6dc0918777d43b3f961bd18162866f0bbb (commit) via 25f29b974182ae7da36ace86e846b4c0b2807a68 (commit) via ee86770a3f9700374820f90959a9c0fa39b27409 (commit) via 0ad180d71294c513270b4d97cec40ad3af504faa (commit) via 55b0532128304cb60021831cd37adbe4eb5d3650 (commit) via 2d888e339064d39ae894b4df567441539c8c65da (commit) via fe683876952ee6172e46fe770b4f3e48c69646d1 (commit) via 079b8e29168dc081f37f79f3577a5c0690bb7051 (commit) via 6e3655db2cc8202424e54bdde83e4240eb680cc3 (commit) via df0247a3714667e0f60d64da1b30ea200c43c7d5 (commit) from 2e6effd2e0d8e60ede4aa528e771430071c546b4 (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=1f7bd0032253296413770567a90a0a88b6cccb34 commit 1f7bd0032253296413770567a90a0a88b6cccb34 Merge: c4f2f01 10507c6 Author: Brad King AuthorDate: Tue Sep 3 13:37:00 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:42:15 2019 -0400 Merge topic 'add-non-empty-configurations-getter' 10507c6dc0 cmMakefile: Add configurations getter with empty configuration default Acked-by: Kitware Robot Merge-request: !3759 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4f2f011084a5e64e6f3745071ea56a286758682 commit c4f2f011084a5e64e6f3745071ea56a286758682 Merge: 4684e64 2d888e3 Author: Brad King AuthorDate: Tue Sep 3 13:37:29 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:40:44 2019 -0400 Merge topic 'rename-mutating-getfullpath-overload' 2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload Acked-by: Kitware Robot Merge-request: !3757 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4684e64c84d49d9152ebab42c8bc4ffa57652041 commit 4684e64c84d49d9152ebab42c8bc4ffa57652041 Merge: 54b69bd dca9c33 Author: Brad King AuthorDate: Tue Sep 3 13:34:01 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:39:03 2019 -0400 Merge topic 'clang-ipo-support' dca9c33abc Tests: Remove old IPO test c856d4556b bindexplib: supporting llvm bitcode formats using llvm-nm 079b8e2916 Clang: prefer lld-link over link.exe 6e3655db2c Clang: add LTO support for GNU-command line clang on windows Acked-by: Kitware Robot Merge-request: !3527 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54b69bd6426bffae6ba11b4d0d95a4ad8c31b309 commit 54b69bd6426bffae6ba11b4d0d95a4ad8c31b309 Merge: cee20ad aaf2435 Author: Brad King AuthorDate: Tue Sep 3 13:35:09 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:36:59 2019 -0400 Merge topic 'gtest-1.8.1' aaf2435780 FindGTest: Add support for googletest 1.8.1 folder structure Acked-by: Kitware Robot Merge-request: !3756 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee20ad5374e2547cad9f2847006cf753c301042 commit cee20ad5374e2547cad9f2847006cf753c301042 Merge: d8e3237 25f29b9 Author: Brad King AuthorDate: Tue Sep 3 13:32:02 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:34:46 2019 -0400 Merge topic 'vs-cuda-custom-dir' 25f29b9741 cuda: Adapted tests to work with modified cuda toolset ee86770a3f cuda: Added docs for extended cuda toolset 0ad180d712 cuda: Extend cuda compiler detection to work with custom cuda path 55b0532128 cuda: Extend vs10 target generator to use custom cuda path df0247a371 cuda: Extend toolset argument to accept path Acked-by: Kitware Robot Merge-request: !3713 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8e323761152dcf494606ca3436637a9cbbe1741 commit d8e323761152dcf494606ca3436637a9cbbe1741 Merge: 2e6effd fe68387 Author: Brad King AuthorDate: Tue Sep 3 13:30:36 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:33:02 2019 -0400 Merge topic 'FindPkgConfig-module-name' fe68387695 FindPkgConfig: return the module found by pkg_search_module Acked-by: Kitware Robot
[Cmake-commits] CMake branch, master, updated. v3.15.2-939-g2e6effd
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 2e6effd2e0d8e60ede4aa528e771430071c546b4 (commit) via d615ce4386f98cfac4d90e136cb272ec2d635e15 (commit) via c1dbbef2395847d9b68e4c7871f97066bdbad3a3 (commit) via ea63df139efbe70b58fe95c7f0f4b6b35dd04a95 (commit) via 3b8fa496e7a9482cb4592e9f36b54f5b1bc3cdea (commit) via 7828577065afe8cf59434166ae0a0589689caea2 (commit) via cf29fa18c8f0e7e482a0668ac1f36d1928080214 (commit) via d7df3cd73f00aefd1878d2842ee8b56541ae3c44 (commit) via 8ff43de1a509b779fe6635086e16f6808a4dc765 (commit) via da5ac4bb602bafb97b4dc0e012f1d26bbab58e3a (commit) via 1ae24ee1087c62740a9ed357a81274a9f9e8e70d (commit) via 5c028c27eb807e22f7d6095da4d9b694487ede05 (commit) via d4e6b2ae25659699fccf6bc5888e87179f41b23a (commit) from 917cfecf12b77294370cf96150becbb4c0a9db1c (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=2e6effd2e0d8e60ede4aa528e771430071c546b4 commit 2e6effd2e0d8e60ede4aa528e771430071c546b4 Merge: d615ce4 da5ac4b Author: Brad King AuthorDate: Tue Sep 3 13:29:57 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:30:15 2019 -0400 Merge topic 'cpack-install-multiple-configurations' da5ac4bb60 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable d4e6b2ae25 Refactor: Use `unique_ptr` instead of raw pointer Acked-by: Kitware Robot Merge-request: !3533 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d615ce4386f98cfac4d90e136cb272ec2d635e15 commit d615ce4386f98cfac4d90e136cb272ec2d635e15 Merge: c1dbbef 5c028c2 Author: Brad King AuthorDate: Tue Sep 3 13:26:58 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:27:39 2019 -0400 Merge topic 'xcode11-swift' 5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11 Acked-by: Kitware Robot Merge-request: !3758 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1dbbef2395847d9b68e4c7871f97066bdbad3a3 commit c1dbbef2395847d9b68e4c7871f97066bdbad3a3 Merge: ea63df1 3b8fa49 Author: Brad King AuthorDate: Tue Sep 3 09:26:03 2019 -0400 Commit: Brad King CommitDate: Tue Sep 3 09:26:03 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea63df139efbe70b58fe95c7f0f4b6b35dd04a95 commit ea63df139efbe70b58fe95c7f0f4b6b35dd04a95 Merge: 917cfec 7828577 Author: Brad King AuthorDate: Tue Sep 3 13:23:22 2019 + Commit: Kitware Robot CommitDate: Tue Sep 3 09:23:48 2019 -0400 Merge topic 'FindBoost-1.71' 7828577065 FindBoost: Add support for Boost 1.71 cf29fa18c8 FindBoost: Unwrap compatibility INTERFACE targets for legacy variables d7df3cd73f FindBoost: Remove incorrect 1.70 timer dependency 8ff43de1a5 FindBoost: Simplify conditional block for last known version Acked-by: Kitware Robot Acked-by: Dennis Klein Merge-request: !3763 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da5ac4bb602bafb97b4dc0e012f1d26bbab58e3a commit da5ac4bb602bafb97b4dc0e012f1d26bbab58e3a Author: Alex Turbov AuthorDate: Wed Jul 10 00:07:55 2019 +0300 Commit: Brad King CommitDate: Fri Aug 30 11:02:43 2019 -0400 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable For the multi-configuration generators one can specify the list of configurations to include in the package. E.g. having a project, where debug libraries have a suffix to distinct them from the release builds, one can build the package containing both `Debug` and `Release` binaries. diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst index 10f617e..f82c466 100644 --- a/Help/manual/cpack.1.rst +++ b/Help/manual/cpack.1.rst @@ -48,9 +48,11 @@ Options the :variable:`CPACK_GENERATOR` variable determines the default set of generators that will be used. -``-C `` - Specify the project configuration to be packaged (e.g. ``Debug``, - ``Release``, etc.). When the CMake project uses a multi-configuration +``-C `` + Specify the project configuration(s) to be packaged (e.g. ``Debug``, + ``Release``, etc.), where is a + :ref:`semicolon-separated list `. + When the CMake project uses a multi-configuration generator such as Xcode or Visual Studio, this option is needed to tell ``cpack`` which built executables to include in the package. diff --git a/Help/release/dev/cpack-install-multiple-configurations.rst b/Help/release/dev/cpack-install-multiple-configurations.rst new file mode 100644 index 000..d1692dc --- /dev/null
[Cmake-commits] CMake branch, release, updated. v3.15.2-30-g3b8fa49
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 3b8fa496e7a9482cb4592e9f36b54f5b1bc3cdea (commit) via 7828577065afe8cf59434166ae0a0589689caea2 (commit) via cf29fa18c8f0e7e482a0668ac1f36d1928080214 (commit) via d7df3cd73f00aefd1878d2842ee8b56541ae3c44 (commit) via 8ff43de1a509b779fe6635086e16f6808a4dc765 (commit) via 1ae24ee1087c62740a9ed357a81274a9f9e8e70d (commit) via 9da1c33cf1613d2b5b8192c2cffefa87466b002f (commit) from aeeccc3b15c6476ecdaa51d40bb9500900d11ce2 (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/FindBoost.cmake| 49 ++ Source/cmFileAPICodemodel.cxx | 6 +++ .../FindBoost/CMakePackage_New/BoostConfig.cmake | 5 +++ 3 files changed, 42 insertions(+), 18 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.15.2-926-g917cfec
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 917cfecf12b77294370cf96150becbb4c0a9db1c (commit)
via 9da1c33cf1613d2b5b8192c2cffefa87466b002f (commit)
from cfae4c657fb0fff18cffd294fc5516cddfc174d1 (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=917cfecf12b77294370cf96150becbb4c0a9db1c
commit 917cfecf12b77294370cf96150becbb4c0a9db1c
Merge: cfae4c6 9da1c33
Author: Brad King
AuthorDate: Tue Sep 3 13:21:28 2019 +
Commit: Kitware Robot
CommitDate: Tue Sep 3 09:21:47 2019 -0400
Merge topic 'fileapi-CMP0037-OLD'
9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD
behavior
Acked-by: Kitware Robot
Merge-request: !3760
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9da1c33cf1613d2b5b8192c2cffefa87466b002f
commit 9da1c33cf1613d2b5b8192c2cffefa87466b002f
Author: Brad King
AuthorDate: Fri Aug 30 10:18:28 2019 -0400
Commit: Brad King
CommitDate: Fri Aug 30 10:20:12 2019 -0400
fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior
With CMP0037 OLD behavior, executable and library target names may
contain a slash. Avoid constructing file names with slashes.
Fixes: #19653
diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx
index 6025025..fecbf63 100644
--- a/Source/cmFileAPICodemodel.cxx
+++ b/Source/cmFileAPICodemodel.cxx
@@ -502,6 +502,12 @@ Json::Value CodemodelConfig::DumpTarget(cmGeneratorTarget*
gt,
{
Target t(gt, this->Config);
std::string prefix = "target-" + gt->GetName();
+ for (char& c : prefix) {
+// CMP0037 OLD behavior allows slashes in target names. Remove them.
+if (c == '/' || c == '\\') {
+ c = '_';
+}
+ }
if (!this->Config.empty()) {
prefix += "-" + this->Config;
}
---
Summary of changes:
Source/cmFileAPICodemodel.cxx | 6 ++
1 file changed, 6 insertions(+)
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.15.2-924-gcfae4c6
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 cfae4c657fb0fff18cffd294fc5516cddfc174d1 (commit) from 679f5a0ec7d833a6f0b870534d1433796fba9ef3 (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=cfae4c657fb0fff18cffd294fc5516cddfc174d1 commit cfae4c657fb0fff18cffd294fc5516cddfc174d1 Author: Kitware Robot AuthorDate: Tue Sep 3 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Tue Sep 3 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c8e14b0..46f7cce 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190902) +set(CMake_VERSION_PATCH 20190903) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-922-gff7c31a
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 ff7c31abfd110e769e422d5005a8a41b21153fd6 (commit) from 45aacb7698047c35e6cb02237d43cb07551b872e (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=ff7c31abfd110e769e422d5005a8a41b21153fd6 commit ff7c31abfd110e769e422d5005a8a41b21153fd6 Author: Kitware Robot AuthorDate: Sun Sep 1 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun Sep 1 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9c4be04..14e1aa2 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190831) +set(CMake_VERSION_PATCH 20190901) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-918-g2d01dca
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 2d01dcab29aaa60e905e828d4a07d2f72f7eeb20 (commit)
via a38965db9a515c0f8af9035d6cca13cf684b406a (commit)
via e6c9a8bac3a2f3103ee79058e92dadd2d30c8ac5 (commit)
via 2c71208a78f47f59972a3a39b1f038d293abd83b (commit)
from f8917685f32677c4055176d96bbd5a747da03fdb (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=2d01dcab29aaa60e905e828d4a07d2f72f7eeb20
commit 2d01dcab29aaa60e905e828d4a07d2f72f7eeb20
Merge: a38965d 2c71208
Author: Brad King
AuthorDate: Fri Aug 30 14:43:00 2019 +
Commit: Kitware Robot
CommitDate: Fri Aug 30 10:43:09 2019 -0400
Merge topic 'rel-nightly-test'
2c71208a78 Tests: Fix nightly binary tests to fail on error
Acked-by: Kitware Robot
Merge-request: !3755
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a38965db9a515c0f8af9035d6cca13cf684b406a
commit a38965db9a515c0f8af9035d6cca13cf684b406a
Merge: f891768 e6c9a8b
Author: Brad King
AuthorDate: Fri Aug 30 14:38:17 2019 +
Commit: Kitware Robot
CommitDate: Fri Aug 30 10:38:25 2019 -0400
Merge topic 'remove_directory-symlink'
e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks
Acked-by: Kitware Robot
Merge-request: !3738
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6c9a8bac3a2f3103ee79058e92dadd2d30c8ac5
commit e6c9a8bac3a2f3103ee79058e92dadd2d30c8ac5
Author: Jon Chronopoulos
AuthorDate: Mon Aug 26 14:21:12 2019 +1000
Commit: Brad King
CommitDate: Fri Aug 30 10:37:30 2019 -0400
cmake: Teach -E remove_directory to remove directory symlinks
If the argument to `remove_directory` is a symlink to a directory,
remove the symlink instead.
Issue: #19533
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0832e2f..fbbd47c 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -676,10 +676,17 @@ int cmcmd::ExecuteCMakeCommand(std::vector
const& args)
// If an error occurs, we want to continue removing directories.
bool return_value = false;
for (auto const& arg : cmMakeRange(args).advance(2)) {
-if (cmSystemTools::FileIsDirectory(arg) &&
-!cmSystemTools::RemoveADirectory(arg)) {
- std::cerr << "Error removing directory \"" << arg << "\".\n";
- return_value = true;
+if (cmSystemTools::FileIsDirectory(arg)) {
+ if (cmSystemTools::FileIsSymlink(arg)) {
+if (!cmSystemTools::RemoveFile(arg)) {
+ std::cerr << "Error removing directory symlink \"" << arg
+<< "\".\n";
+ return_value = true;
+}
+ } else if (!cmSystemTools::RemoveADirectory(arg)) {
+std::cerr << "Error removing directory \"" << arg << "\".\n";
+return_value = true;
+ }
}
}
return return_value;
diff --git
a/Tests/RunCMake/CommandLine/E_remove_directory-symlink-dir-check.cmake
b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-dir-check.cmake
new file mode 100644
index 000..f70312c
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-dir-check.cmake
@@ -0,0 +1,6 @@
+if(EXISTS ${out}/link_dir)
+ set(RunCMake_TEST_FAILED "did not remove ${out}/link_dir")
+endif()
+if(NOT EXISTS ${out}/dir)
+ set(RunCMake_TEST_FAILED "should not have removed ${out}/dir")
+endif()
diff --git
a/Tests/RunCMake/CommandLine/E_remove_directory-symlink-dir-stderr.txt
b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-dir-stderr.txt
new file mode 100644
index 000..e69de29
diff --git
a/Tests/RunCMake/CommandLine/E_remove_directory-symlink-file-check.cmake
b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-file-check.cmake
new file mode 100644
index 000..23d7c6d
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-file-check.cmake
@@ -0,0 +1,6 @@
+if(NOT EXISTS ${outfile})
+ set(RunCMake_TEST_FAILED "removed non-directory ${outfile}")
+endif()
+if(NOT EXISTS ${out}/link_file_for_test.txt)
+ set(RunCMake_TEST_FAILED "removed non-directory symlink
${out}/link_file_for_test.txt")
+endif()
diff --git
a/Tests/RunCMake/CommandLine/E_remove_directory-symlink-file-stderr.txt
b/Tests/RunCMake/CommandLine/E_remove_directory-symlink-file-stderr.txt
new file mode 100644
index 000..e69de29
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index dd49423..2bc5966 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++
[Cmake-commits] CMake branch, master, updated. v3.15.2-914-gf891768
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 f8917685f32677c4055176d96bbd5a747da03fdb (commit)
via 9141fbe0c1fc85a90cab3f1cf72739df712ca54d (commit)
via 6a9de634b2973f9ee51333fb75c22d994d3b0de8 (commit)
via f9a3f13415bb6d6f1750cfe5a45ce4aa9e329907 (commit)
via 2c95c35c51c09ffcdaf1135489a6864cee02ff4f (commit)
from 8720353d4adfa83295d136835f44dce0173efd79 (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=f8917685f32677c4055176d96bbd5a747da03fdb
commit f8917685f32677c4055176d96bbd5a747da03fdb
Merge: 9141fbe 6a9de63
Author: Brad King
AuthorDate: Fri Aug 30 14:35:38 2019 +
Commit: Kitware Robot
CommitDate: Fri Aug 30 10:36:07 2019 -0400
Merge topic 'update-kwsys'
6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys
f9a3f13415 KWSys 2019-08-29 (08f14d96)
Acked-by: Kitware Robot
Merge-request: !3754
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9141fbe0c1fc85a90cab3f1cf72739df712ca54d
commit 9141fbe0c1fc85a90cab3f1cf72739df712ca54d
Merge: 8720353 2c95c35
Author: Brad King
AuthorDate: Fri Aug 30 14:35:00 2019 +
Commit: Kitware Robot
CommitDate: Fri Aug 30 10:35:09 2019 -0400
Merge topic 'docker-rel-linux'
2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux
Acked-by: Kitware Robot
Merge-request: !3753
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a9de634b2973f9ee51333fb75c22d994d3b0de8
commit 6a9de634b2973f9ee51333fb75c22d994d3b0de8
Merge: 3ec986c f9a3f13
Author: Brad King
AuthorDate: Thu Aug 29 13:07:11 2019 -0400
Commit: Brad King
CommitDate: Thu Aug 29 13:07:11 2019 -0400
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-08-29 (08f14d96)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9a3f13415bb6d6f1750cfe5a45ce4aa9e329907
commit f9a3f13415bb6d6f1750cfe5a45ce4aa9e329907
Author: KWSys Upstream
AuthorDate: Thu Aug 29 11:30:45 2019 -0400
Commit: Brad King
CommitDate: Thu Aug 29 13:07:10 2019 -0400
KWSys 2019-08-29 (08f14d96)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 08f14d96b449e5d1e166998b363da16167a3ac82 (master).
Upstream Shortlog
-
Ben Boeckel (1):
9afecb09 SystemTools: fix typo in junction functions
Jon Chronopoulos (1):
38486236 SystemTools: do not special case a junction in RemoveFile
Rolf Eike Beer (3):
b747462d CMake: drop needless x${VAR} tricks
1ed70242 tests: verify SystemTools::CopyFileIfDifferent()
f73d1b4f SystemTools: factor out "dest is directory" case from
CopyFileIfDifferent()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79e813e..09bcdb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,8 +121,8 @@ if(KWSYS_CXX_STANDARD)
set(CMAKE_CXX_STANDARD "${KWSYS_CXX_STANDARD}")
elseif(NOT DEFINED CMAKE_CXX_STANDARD AND NOT DEFINED KWSYS_CXX_STANDARD)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
- AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
- AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU"
+ AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC"
+ AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"
)
set(CMAKE_CXX_STANDARD 14)
else()
@@ -1013,7 +1013,7 @@ ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
# Disable deprecation warnings for standard C functions.
IF(MSVC OR (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "Intel" OR
- (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC"
+ (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL
"MSVC"
ADD_DEFINITIONS(
-D_CRT_NONSTDC_NO_DEPRECATE
-D_CRT_SECURE_NO_DEPRECATE
@@ -1104,7 +1104,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET(KWSYS_CXX_TESTS ${KWSYS_CXX_TESTS}
testConsoleBuf.cxx
)
- IF("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" AND
+ IF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "19.0.23506")
set_property(SOURCE testConsoleBuf.cxx testConsoleBufChild.cxx
PROPERTY COMPILE_FLAGS /utf-8)
ENDIF()
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 36f24c7..8571477 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2169,24 +2169,24 @@ std::string
SystemTools::ConvertToWindowsOutputPath(const std::string& path)
return ret;
}
+/**
+ * Append the filename from the
[Cmake-commits] CMake branch, master, updated. v3.15.2-909-g8720353
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 8720353d4adfa83295d136835f44dce0173efd79 (commit) from 3ec986ce8e8df269eb6b6b9f37e12b02194168fd (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=8720353d4adfa83295d136835f44dce0173efd79 commit 8720353d4adfa83295d136835f44dce0173efd79 Author: Kitware Robot AuthorDate: Fri Aug 30 00:01:35 2019 -0400 Commit: Kitware Robot CommitDate: Fri Aug 30 00:01:35 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1b06e45..1d5a30c 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190829) +set(CMake_VERSION_PATCH 20190830) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-894-g030570d
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 030570d71ff8b15a7242203f2638d3b77af755b9 (commit)
via 32b15d320f9afd858a5966744dda5568cd396798 (commit)
via b66cd3fe63d381ed2d26191fe440b59bf01fc67b (commit)
via 619a92eacd689d867343c05fff568bf1dc9467b7 (commit)
via 10dc684508ca0055f1558a40f2a6bba6bc1c (commit)
via da6c4b12736b0d73987d0a8a0bd06a5bbac7193b (commit)
via 7a78d1541568343898160d8e934047b84a6c98b3 (commit)
via c797148e8573614a66465cd4ca6ed4bf5e8a5584 (commit)
via 8586077baae74c90056704c022aad8357788fa38 (commit)
from 49294535042ce610fae867449c82435baef96744 (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=030570d71ff8b15a7242203f2638d3b77af755b9
commit 030570d71ff8b15a7242203f2638d3b77af755b9
Merge: 4929453 32b15d3
Author: Brad King
AuthorDate: Thu Aug 29 13:36:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Aug 29 09:36:36 2019 -0400
Merge topic 'autogen_strcat'
32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations
b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups
619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations
10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups
da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups
7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept
cm::string_view
c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator
names
8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view
Acked-by: Kitware Robot
Merge-request: !3742
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32b15d320f9afd858a5966744dda5568cd396798
commit 32b15d320f9afd858a5966744dda5568cd396798
Author: Sebastian Holtermann
AuthorDate: Mon Aug 26 18:36:18 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Tue Aug 27 17:31:46 2019 +0200
Autogen: cmQtAutoMocUic settings hash computation optimizations
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index d4d9e56..133bae5 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -1912,22 +1912,19 @@ void cmQtAutoMocUic::SettingsFileRead()
// Compose current settings strings
{
cmCryptoHash cryptoHash(cmCryptoHash::AlgoSHA256);
-std::string const sep(";");
-auto cha = [, ](std::string const& value) {
+auto cha = [](cm::string_view value) {
cryptoHash.Append(value);
- cryptoHash.Append(sep);
+ cryptoHash.Append(";");
};
if (MocConst_.Enabled) {
cryptoHash.Initialize();
cha(MocConst().Executable);
- for (auto const& value : MocConst().AllOptions) {
-cha(value);
- }
+ std::for_each(MocConst().AllOptions.begin(), MocConst().AllOptions.end(),
+cha);
cha(BaseConst().IncludeProjectDirsBefore ? "TRUE" : "FALSE");
- for (auto const& value : MocConst().PredefsCmd) {
-cha(value);
- }
+ std::for_each(MocConst().PredefsCmd.begin(), MocConst().PredefsCmd.end(),
+cha);
for (auto const& filter : MocConst().DependFilters) {
cha(filter.Key);
}
@@ -1940,14 +1937,11 @@ void cmQtAutoMocUic::SettingsFileRead()
if (UicConst().Enabled) {
cryptoHash.Initialize();
cha(UicConst().Executable);
- for (auto const& value : UicConst().TargetOptions) {
-cha(value);
- }
+ std::for_each(UicConst().TargetOptions.begin(),
+UicConst().TargetOptions.end(), cha);
for (const auto& item : UicConst().Options) {
cha(item.first);
-for (auto const& svalue : item.second) {
- cha(svalue);
-}
+std::for_each(item.second.begin(), item.second.end(), cha);
}
SettingsStringUic_ = cryptoHash.FinalizeHex();
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b66cd3fe63d381ed2d26191fe440b59bf01fc67b
commit b66cd3fe63d381ed2d26191fe440b59bf01fc67b
Author: Sebastian Holtermann
AuthorDate: Mon Aug 26 18:30:57 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Tue Aug 27 17:31:46 2019 +0200
Autogen: cmQtAutoMocUic string concatenation cleanups
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index df190a1..d4d9e56 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -3,10 +3,9 @@
#include "cmQtAutoMocUic.h"
#include
-#include
+#include
#include
#include
-#include
#include
#include "cm_memory.hxx"
@@ -233,22 +232,21 @@
[Cmake-commits] CMake branch, master, updated. v3.15.2-885-g4929453
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 49294535042ce610fae867449c82435baef96744 (commit)
via 689fdbfc610057b2ddb6a19d589292bf7d26fcdd (commit)
via 2d7cfd30ac459800e23e00a53e886d3dc0e62a66 (commit)
via facc240a45cb81f4437c7c41cf97ecb8d5b0ce55 (commit)
via bf832ccf01894bf605c17a89f2bc3babd24df108 (commit)
via ab153f17bf7c87a6ee14a94c19fc1dbd01849f05 (commit)
via ed294c1664cafe573c813f2a95ebec3159e0d21e (commit)
via 4b8a864d52fa7501af915b3f94dfbd55fe9065b8 (commit)
from e0090767808bc68481697da18e50f5f2c62dd522 (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=49294535042ce610fae867449c82435baef96744
commit 49294535042ce610fae867449c82435baef96744
Merge: e009076 689fdbf
Author: Brad King
AuthorDate: Thu Aug 29 13:32:03 2019 +
Commit: Kitware Robot
CommitDate: Thu Aug 29 09:32:13 2019 -0400
Merge topic 'docker-rel-linux'
689fdbfc61 Utilities/Release: Drop linux64 script in favor of docker build
2d7cfd30ac Utilities/Release: Drop source archive generation in scripts
facc240a45 Utilities/Release: Add docker specs to build and test Linux
binaries
bf832ccf01 Utilities/Release: Add README.rst describing directory content
ab153f17bf Utilities/Release: Drop machine-specific README
ed294c1664 Add option to skip CMake tests that need network access
4b8a864d52 Add option to test CMake itself against its hosting CMake
Acked-by: Kitware Robot
Acked-by: Gregor Jasny
Merge-request: !3727
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=689fdbfc610057b2ddb6a19d589292bf7d26fcdd
commit 689fdbfc610057b2ddb6a19d589292bf7d26fcdd
Author: Brad King
AuthorDate: Tue Aug 27 11:09:42 2019 -0400
Commit: Brad King
CommitDate: Wed Aug 28 13:20:36 2019 -0400
Utilities/Release: Drop linux64 script in favor of docker build
Drop also drop the CMakeNightlyLinux64 test that uses the script.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7098c75..02e28d4 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -780,8 +780,6 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev
-- '${CMake_BUILD_NIGH
win64_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
osx_release.cmake)
-ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
- linux64_release.cmake)
set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32)
endif()
diff --git a/Utilities/Release/create-cmake-release.cmake
b/Utilities/Release/create-cmake-release.cmake
index 0622ad8..17a2151 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -45,14 +45,12 @@ echo 'Failed to create \${name}.tar.gz'
endfunction()
write_docs_shell_script("create-${CMAKE_CREATE_VERSION}-docs.sh")
-write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-linux64.sh"
linux64_release) # Linux x86_64
write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-macos.sh" osx_release
) # macOS x86_64
write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-win64.sh"
win64_release ) # Windows x64
write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-win32.sh"
win32_release ) # Windows x86
message("Build docs first and then build for each platform:
./create-${CMAKE_CREATE_VERSION}-docs.sh&&
- ./create-${CMAKE_CREATE_VERSION}-linux64.sh &&
./create-${CMAKE_CREATE_VERSION}-macos.sh &&
./create-${CMAKE_CREATE_VERSION}-win64.sh &&
./create-${CMAKE_CREATE_VERSION}-win32.sh &&
diff --git a/Utilities/Release/linux64_release.cmake
b/Utilities/Release/linux64_release.cmake
deleted file mode 100644
index cabb1a5..000
--- a/Utilities/Release/linux64_release.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-set(PROCESSORS 4)
-set(BOOTSTRAP_ARGS "--docdir=doc/cmake")
-set(HOST linux64)
-set(MAKE_PROGRAM "make")
-set(CPACK_BINARY_GENERATORS "STGZ TGZ")
-set(CPACK_SOURCE_GENERATORS "")
-set(CC /opt/gcc-8.2.0/bin/gcc)
-set(CXX /opt/gcc-8.2.0/bin/g++)
-set(CFLAGS "")
-set(CXXFLAGS "")
-set(qt_prefix "/home/kitware/qt-5.7.0")
-set(qt_xcb_libs
- ${qt_prefix}/plugins/platforms/libqxcb.a
- ${qt_prefix}/lib/libQt5XcbQpa.a
- ${qt_prefix}/lib/libQt5PlatformSupport.a
- ${qt_prefix}/lib/libxcb-static.a
- -lX11-xcb
- -lX11
- -lxcb
- -lfontconfig
- -lfreetype
- )
-set(INITIAL_CACHE "
-CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_C_STANDARD:STRING=11
-CMAKE_CXX_STANDARD:STRING=14
-CMAKE_C_FLAGS:STRING=-D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1
-D_SVID_SOURCE=1 -D_BSD_SOURCE=1
[Cmake-commits] CMake branch, release, updated. v3.15.2-23-gaeeccc3
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 aeeccc3b15c6476ecdaa51d40bb9500900d11ce2 (commit) via 4c8760c9fb2951d897a307637a761c371e48e615 (commit) from 1d953058a2fe88b36c17dfe1f0f1c703a53f5f96 (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: Source/cmFindBase.cxx | 2 +- Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt | 1 + Tests/RunCMake/find_path/EmptyOldStyle.cmake | 2 ++ Tests/RunCMake/find_path/RunCMakeTest.cmake | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle.cmake 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.15.2-877-ge009076
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 e0090767808bc68481697da18e50f5f2c62dd522 (commit) via 31c356e366d7c9c1d0bc2998e95937ec6de43232 (commit) via aeeccc3b15c6476ecdaa51d40bb9500900d11ce2 (commit) via 84e33e6da4aef67f5eeae06cf73fd461a2d634d6 (commit) via 4c8760c9fb2951d897a307637a761c371e48e615 (commit) from 2d0a24acc53b83d669955eb4933e64bb2ea8c88f (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=e0090767808bc68481697da18e50f5f2c62dd522 commit e0090767808bc68481697da18e50f5f2c62dd522 Merge: 31c356e aeeccc3 Author: Brad King AuthorDate: Thu Aug 29 09:25:45 2019 -0400 Commit: Brad King CommitDate: Thu Aug 29 09:25:45 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31c356e366d7c9c1d0bc2998e95937ec6de43232 commit 31c356e366d7c9c1d0bc2998e95937ec6de43232 Merge: 2d0a24a 84e33e6 Author: Brad King AuthorDate: Thu Aug 29 13:25:03 2019 + Commit: Kitware Robot CommitDate: Thu Aug 29 09:25:13 2019 -0400 Merge topic 'find-no-name' 84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name 4c8760c9fb find_path: Fix crash on empty old-style list of names Acked-by: Kitware Robot Merge-request: !3751 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e33e6da4aef67f5eeae06cf73fd461a2d634d6 commit 84e33e6da4aef67f5eeae06cf73fd461a2d634d6 Merge: 9629176 4c8760c Author: Brad King AuthorDate: Wed Aug 28 11:19:39 2019 -0400 Commit: Brad King CommitDate: Wed Aug 28 11:19:39 2019 -0400 Merge branch 'backport-find-no-name' into find-no-name diff --cc Tests/RunCMake/find_path/RunCMakeTest.cmake index 8b5b5b7,3afbedc..ed55f51 --- a/Tests/RunCMake/find_path/RunCMakeTest.cmake +++ b/Tests/RunCMake/find_path/RunCMakeTest.cmake @@@ -1,7 -1,9 +1,8 @@@ include(RunCMake) + run_cmake(EmptyOldStyle) -if(WIN32 OR CYGWIN) - run_cmake(PrefixInPATH) -endif() +run_cmake(FromPATHEnv) +run_cmake(PrefixInPATH) if(APPLE) run_cmake(FrameworksWithSubdirs) --- Summary of changes: Source/cmFindBase.cxx | 2 +- Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt | 1 + Tests/RunCMake/find_path/EmptyOldStyle.cmake | 2 ++ Tests/RunCMake/find_path/RunCMakeTest.cmake | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle.cmake 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.15.2-872-g2d0a24a
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 2d0a24acc53b83d669955eb4933e64bb2ea8c88f (commit) from 3e93b2fa66ecca7c25818c32a2b50acef2627841 (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=2d0a24acc53b83d669955eb4933e64bb2ea8c88f commit 2d0a24acc53b83d669955eb4933e64bb2ea8c88f Author: Kitware Robot AuthorDate: Thu Aug 29 00:01:03 2019 -0400 Commit: Kitware Robot CommitDate: Thu Aug 29 00:01:03 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ae9ce18..1b06e45 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190828) +set(CMake_VERSION_PATCH 20190829) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-871-g3e93b2f
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 3e93b2fa66ecca7c25818c32a2b50acef2627841 (commit)
via ffa1fa20e6ef3e78aad2dca75658232593509519 (commit)
via 606df71e48bf3594a7f79d68d990f401af9e45ea (commit)
via ae861c196ad2128409f231fff3024b624918311d (commit)
via 41ba3e28e6840fd560a537d400146d2cde67a239 (commit)
via a40744c81a8d6dad994def5a63103fc229a75afc (commit)
via 8cb3cffa42e11c2508ed8db703f2f9a1a73fbbb9 (commit)
via 9367f7dcdd8534ce2071fcc02834cdb826e76395 (commit)
via 54872b73b9436086fd4a801b1224ebeb81af3935 (commit)
via 11f35d340ed359df6202f23fc143b2fd36de5995 (commit)
via ae51aa32f0589e4f5fc9a251a5be534cba631876 (commit)
via 185fa2c4f3e21542dd42bfb396fc8520d996772a (commit)
via c8deeac68f1462461a464acd6d2c2728b9a293c2 (commit)
via c2c222eba13476a95a362731528d85a3e76ed83a (commit)
via 8909a450a6fb74447ef6dc49f16d747bae3c72ea (commit)
via 7533e47cccb8828885de518e40d58b629200d23d (commit)
via 9d6fc3f5ed527874d44a111eb80c09e740710e48 (commit)
via 524d72151449acf5d76e55172174552b83a74f61 (commit)
from 3c7d09e46512e8a69476cf4dfda6ace488a49244 (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=3e93b2fa66ecca7c25818c32a2b50acef2627841
commit 3e93b2fa66ecca7c25818c32a2b50acef2627841
Merge: ffa1fa2 8909a45
Author: Brad King
AuthorDate: Wed Aug 28 15:52:57 2019 +
Commit: Kitware Robot
CommitDate: Wed Aug 28 11:53:12 2019 -0400
Merge topic 'vs-ConfigurationType-genex'
8909a450a6 VS: Add support for generator expressions to
VS_CONFIGURATION_TYPE
Acked-by: Kitware Robot
Merge-request: !3746
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffa1fa20e6ef3e78aad2dca75658232593509519
commit ffa1fa20e6ef3e78aad2dca75658232593509519
Merge: 606df71 41ba3e2
Author: Brad King
AuthorDate: Wed Aug 28 15:51:53 2019 +
Commit: Kitware Robot
CommitDate: Wed Aug 28 11:52:04 2019 -0400
Merge topic 'sf-LANGUAGE-prop'
41ba3e28e6 Tests: Collect SourceFileProperty tests
a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser
8cb3cffa42 cmSourceFile: Rename non-const GetLanguage
Acked-by: Kitware Robot
Merge-request: !3744
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=606df71e48bf3594a7f79d68d990f401af9e45ea
commit 606df71e48bf3594a7f79d68d990f401af9e45ea
Merge: ae861c1 9367f7d
Author: Brad King
AuthorDate: Wed Aug 28 15:50:42 2019 +
Commit: Kitware Robot
CommitDate: Wed Aug 28 11:51:00 2019 -0400
Merge topic 'cpack-ifw-command-vectorization'
9367f7dcdd CPack/IFW: Command vectorization
Acked-by: Kitware Robot
Merge-request: !3732
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae861c196ad2128409f231fff3024b624918311d
commit ae861c196ad2128409f231fff3024b624918311d
Merge: 3c7d09e 54872b7
Author: Brad King
AuthorDate: Wed Aug 28 15:49:23 2019 +
Commit: Kitware Robot
CommitDate: Wed Aug 28 11:49:32 2019 -0400
Merge topic 'cmCommand_refactor_disallowed'
54872b73b9 cmCommand refactor: remove cmDisallowedCommand class
11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload
ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand
185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand
c8deeac68f cmCommand refactor: cmSubdirDependsCommand
c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand
7533e47ccc cmCommand refactor: cmLoadCommandCommand
9d6fc3f5ed cmCommand refactor: cmExportLibraryDependenciesCommand
...
Acked-by: Kitware Robot
Merge-request: !3736
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41ba3e28e6840fd560a537d400146d2cde67a239
commit 41ba3e28e6840fd560a537d400146d2cde67a239
Author: Tushar Maheshwari
AuthorDate: Tue Aug 27 22:28:34 2019 +0530
Commit: Tushar Maheshwari
CommitDate: Tue Aug 27 22:28:34 2019 +0530
Tests: Collect SourceFileProperty tests
- Move the related test from COnly to SourceFileProperty
- Cover `get_source_file_property` and `get_property(... SOURCE ...)`
diff --git a/Tests/COnly/CMakeLists.txt b/Tests/COnly/CMakeLists.txt
index 3037f13..20615fe 100644
--- a/Tests/COnly/CMakeLists.txt
+++ b/Tests/COnly/CMakeLists.txt
@@ -13,11 +13,5 @@ if(MSVC_VERSION AND NOT CMAKE_C_COMPILER_ID STREQUAL Clang
OR "x${CMAKE_C_COMPIL
endif()
string(ASCII 35 32 67 77 97 107 101 ASCII_STRING)
message(STATUS "String: ${ASCII_STRING}")
-get_source_file_property(LANG conly.c LANGUAGE)
-if("${LANG}"
[Cmake-commits] CMake branch, master, updated. v3.15.2-853-g3c7d09e
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 3c7d09e46512e8a69476cf4dfda6ace488a49244 (commit) via 238be91529b72223b60590c71879552e0f76ae69 (commit) via 1d953058a2fe88b36c17dfe1f0f1c703a53f5f96 (commit) via e32f70036cd53b7a7f98b59920dcb5577dad7ec2 (commit) from 96291764a11fccd11e913fc9bdb99c4f9ed31e40 (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=3c7d09e46512e8a69476cf4dfda6ace488a49244 commit 3c7d09e46512e8a69476cf4dfda6ace488a49244 Merge: 238be91 1d95305 Author: Brad King AuthorDate: Wed Aug 28 11:28:37 2019 -0400 Commit: Brad King CommitDate: Wed Aug 28 11:28:37 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=238be91529b72223b60590c71879552e0f76ae69 commit 238be91529b72223b60590c71879552e0f76ae69 Merge: 9629176 e32f700 Author: Brad King AuthorDate: Wed Aug 28 15:27:43 2019 + Commit: Kitware Robot CommitDate: Wed Aug 28 11:27:54 2019 -0400 Merge topic 'autogen_fix_use_after_move' e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file Acked-by: Kitware Robot Merge-request: !3745 --- Summary of changes: Source/cmQtAutoMocUic.cxx | 4 ++-- Source/cmQtAutoMocUic.h | 2 +- 2 files changed, 3 insertions(+), 3 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.15.2-849-g9629176
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 96291764a11fccd11e913fc9bdb99c4f9ed31e40 (commit) from 843ab7544e319597306a6d9cea4ab8be3296e6c4 (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=96291764a11fccd11e913fc9bdb99c4f9ed31e40 commit 96291764a11fccd11e913fc9bdb99c4f9ed31e40 Author: Kitware Robot AuthorDate: Wed Aug 28 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Wed Aug 28 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f72c20b..ae9ce18 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190827) +set(CMake_VERSION_PATCH 20190828) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-848-g843ab75
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 843ab7544e319597306a6d9cea4ab8be3296e6c4 (commit)
via 4ca0526f8a78e7abbd08e9978d4110f836ccef9b (commit)
from 57fc6c587ad766135f9f2b62a870374e9251281c (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=843ab7544e319597306a6d9cea4ab8be3296e6c4
commit 843ab7544e319597306a6d9cea4ab8be3296e6c4
Merge: 57fc6c5 4ca0526
Author: Brad King
AuthorDate: Tue Aug 27 15:23:03 2019 +
Commit: Kitware Robot
CommitDate: Tue Aug 27 11:23:22 2019 -0400
Merge topic 'cmake-initial-cache-dirs'
4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts
Acked-by: Kitware Robot
Merge-request: !3709
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ca0526f8a78e7abbd08e9978d4110f836ccef9b
commit 4ca0526f8a78e7abbd08e9978d4110f836ccef9b
Author: Peter Waller
AuthorDate: Tue Aug 20 22:32:50 2019 +0100
Commit: Brad King
CommitDate: Tue Aug 27 10:51:40 2019 -0400
cmake: Pass -S and -B into PreLoad.cmake and -C scripts
Before this, it was not possible to see what the source or build directories
were set to on the command line.
Fixes: #19619
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index 810aaa9..0947e41 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -18,6 +18,9 @@
containing :command:`set` commands that use the ``CACHE`` option, not a
cache-format file.
+ References to :variable:`CMAKE_SOURCE_DIR` and :variable:`CMAKE_BINARY_DIR`
+ within the script evaluate to the top-level source and build tree.
+
``-D :=, -D =``
Create or update a CMake ``CACHE`` entry.
diff --git a/Help/release/dev/cmake-initial-cache-dirs.rst
b/Help/release/dev/cmake-initial-cache-dirs.rst
new file mode 100644
index 000..be91902
--- /dev/null
+++ b/Help/release/dev/cmake-initial-cache-dirs.rst
@@ -0,0 +1,6 @@
+cmake-initial-cache-dirs
+
+
+* The :manual:`cmake(1)` ``-C `` option now evaluates the
+ initial cache script with :variable:`CMAKE_SOURCE_DIR` and
+ :variable:`CMAKE_BINARY_DIR` set to the top-level source and build trees.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4ed17a3..b9902a3 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -430,6 +430,11 @@ bool cmake::SetCacheArgs(const std::vector&
args)
}
// Register fake project commands that hint misuse in script mode.
GetProjectCommandsInScriptMode(this->GetState());
+ // Documented behaviour of CMAKE{,_CURRENT}_{SOURCE,BINARY}_DIR is to be
+ // set to $PWD for -P mode.
+ this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
+ this->SetHomeOutputDirectory(
+cmSystemTools::GetCurrentWorkingDirectory());
this->ReadListFile(args, path);
} else if (arg.find("--find-package", 0) == 0) {
findPackageMode = true;
@@ -459,15 +464,9 @@ void cmake::ReadListFile(const std::vector&
args,
// read in the list file to fill the cache
if (!path.empty()) {
this->CurrentSnapshot = this->State->Reset();
-std::string homeDir = this->GetHomeDirectory();
-std::string homeOutputDir = this->GetHomeOutputDirectory();
-this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
-this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
cmStateSnapshot snapshot = this->GetCurrentSnapshot();
-snapshot.GetDirectory().SetCurrentBinary(
- cmSystemTools::GetCurrentWorkingDirectory());
-snapshot.GetDirectory().SetCurrentSource(
- cmSystemTools::GetCurrentWorkingDirectory());
+snapshot.GetDirectory().SetCurrentBinary(this->GetHomeOutputDirectory());
+snapshot.GetDirectory().SetCurrentSource(this->GetHomeDirectory());
snapshot.SetDefaultDefinitions();
cmMakefile mf(gg, snapshot);
if (this->GetWorkingMode() != NORMAL_MODE) {
@@ -480,8 +479,6 @@ void cmake::ReadListFile(const std::vector&
args,
if (!mf.ReadListFile(path)) {
cmSystemTools::Error("Error processing file: " + path);
}
-this->SetHomeDirectory(homeDir);
-this->SetHomeOutputDirectory(homeOutputDir);
}
// free generic one if generated
diff --git a/Tests/RunCMake/CommandLine/C_buildsrcdir-stderr.txt
b/Tests/RunCMake/CommandLine/C_buildsrcdir-stderr.txt
new file mode 100644
index 000..0d8f72e
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/C_buildsrcdir-stderr.txt
@@ -0,0 +1,8 @@
+initial-cache.txt: CMAKE_SOURCE_DIR: .*/C_buildsrcdir/src
+initial-cache.txt: CMAKE_BINARY_DIR:
[Cmake-commits] CMake branch, master, updated. v3.15.2-846-g57fc6c5
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 57fc6c587ad766135f9f2b62a870374e9251281c (commit) via bd4d52f7ded45d82781294b2374a1b845cbbb020 (commit) via 3186bb91ed10db071c2ceb401a05db5b35b67faa (commit) via 18365587c86396f988e256b5acf4d2312f3be2bb (commit) from 613ac3e7d526d3874176e2b70eba342836a9b6b5 (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=57fc6c587ad766135f9f2b62a870374e9251281c commit 57fc6c587ad766135f9f2b62a870374e9251281c Merge: bd4d52f 3186bb9 Author: Brad King AuthorDate: Tue Aug 27 15:00:43 2019 + Commit: Kitware Robot CommitDate: Tue Aug 27 11:00:53 2019 -0400 Merge topic 'xcode11-compatibility' 3186bb91ed Xcode: Make iOS tests compatible with Xcode 11 Acked-by: Kitware Robot Merge-request: !3743 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4d52f7ded45d82781294b2374a1b845cbbb020 commit bd4d52f7ded45d82781294b2374a1b845cbbb020 Merge: 613ac3e 1836558 Author: Brad King AuthorDate: Tue Aug 27 14:57:59 2019 + Commit: Kitware Robot CommitDate: Tue Aug 27 10:58:28 2019 -0400 Merge topic 'GNUInstallDirs-arch-linux' 18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems Acked-by: Kitware Robot Merge-request: !3735 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3186bb91ed10db071c2ceb401a05db5b35b67faa commit 3186bb91ed10db071c2ceb401a05db5b35b67faa Author: Gregor Jasny AuthorDate: Mon Aug 26 19:51:26 2019 +0200 Commit: Gregor Jasny CommitDate: Mon Aug 26 21:08:00 2019 +0200 Xcode: Make iOS tests compatible with Xcode 11 diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake index ef772ea..8c0b470 100644 --- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake @@ -5,6 +5,7 @@ enable_language(C) if(CMAKE_SYSTEM_NAME STREQUAL "iOS") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") + set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") endif() diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake index f6c00b1..c221033 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake @@ -11,6 +11,7 @@ if(NOT IOS) endif() set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake index ec11dbb..172f2e8 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake @@ -7,6 +7,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9) endif() set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") add_library(foo SHARED foo.cpp) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake index 58e96b4..038a890 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake @@ -7,6 +7,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9) endif() set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") add_library(foo SHARED foo.cpp) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18365587c86396f988e256b5acf4d2312f3be2bb commit 18365587c86396f988e256b5acf4d2312f3be2bb Author: Antonio Rojas AuthorDate: Sun Aug 25 04:46:24 2019 -0400 Commit: Brad King CommitDate: Mon Aug 26 11:14:13 2019 -0400 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems Fixes: #15373 diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index 4db4e18..f95e6e2 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -222,7 +222,8 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set # updated to the new default, unless the user explicitly changed it. endif() if(CMAKE_SYSTEM_NAME
[Cmake-commits] CMake branch, master, updated. v3.15.2-842-g613ac3e
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
AuthorDate: Tue Aug 27 14:57:14 2019 +
Commit: Kitware Robot
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
Merge-request: !3685
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d16402ddc4948a2a26ccdb9377c04d525fcb4f97
commit d16402ddc4948a2a26ccdb9377c04d525fcb4f97
Merge: 52a8fb2 074a6a8
Author: Brad King
AuthorDate: Tue Aug 27 14:54:15 2019 +
Commit: Kitware Robot
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
Merge-request: !3733
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=369c48ee437263a9702c8725f6e73bc4b9d0fe16
commit 369c48ee437263a9702c8725f6e73bc4b9d0fe16
Author: Saleem Abdulrasool
AuthorDate: Sun Aug 11 18:36:06 2019 -0700
Commit: Brad King
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 000..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 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
AuthorDate: Sat Aug 24 19:29:18 2019 +0200
Commit: Brad King
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`.
[Cmake-commits] CMake branch, master, updated. v3.15.2-838-g52a8fb2
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 52a8fb2d532ca44ad9d995fc9c0d910177f594d2 (commit) via 4a4001477d29536034ddae272430743ee88cd1c5 (commit) via 297df45d003bc1084896c2ce9ac35d4ba26c4c6e (commit) via 1d68639654738f74f7a971ce49d8cd291fd426c6 (commit) via 6157c0fe84279f489ef0b458815480d6cc3736da (commit) via dd6154ca1986f7451cf13d952f22faab2673b00a (commit) via b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86 (commit) via 1902e39746ba23ef1918e3b14d96023966df (commit) via 17ce0c29ad6f344ac0e7f628028cf66a1cf19f55 (commit) from 8a8b2fa695c477dff1e801bc7094dd1ee3352713 (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=52a8fb2d532ca44ad9d995fc9c0d910177f594d2 commit 52a8fb2d532ca44ad9d995fc9c0d910177f594d2 Merge: 4a40014 1d68639 Author: Brad King AuthorDate: Tue Aug 27 10:24:57 2019 -0400 Commit: Brad King CommitDate: Tue Aug 27 10:24:57 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a4001477d29536034ddae272430743ee88cd1c5 commit 4a4001477d29536034ddae272430743ee88cd1c5 Merge: 297df45 1902e39 Author: Brad King AuthorDate: Tue Aug 27 14:16:42 2019 + Commit: Kitware Robot CommitDate: Tue Aug 27 10:20:50 2019 -0400 Merge topic 'alpine-cpu_zero' 1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux Acked-by: Kitware Robot Merge-request: !3740 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=297df45d003bc1084896c2ce9ac35d4ba26c4c6e commit 297df45d003bc1084896c2ce9ac35d4ba26c4c6e Merge: 8a8b2fa 17ce0c2 Author: Brad King AuthorDate: Tue Aug 27 14:16:31 2019 + Commit: Kitware Robot CommitDate: Tue Aug 27 10:18:57 2019 -0400 Merge topic 'cmGlobalGenerator-compilerId-lifetime' 17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime Acked-by: Kitware Robot Merge-request: !3741 --- Summary of changes: Source/cmAffinity.cxx| 2 ++ Source/cmGlobalGenerator.cxx | 11 --- 2 files changed, 6 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.2-19-g1d68639
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 1d68639654738f74f7a971ce49d8cd291fd426c6 (commit) via 6157c0fe84279f489ef0b458815480d6cc3736da (commit) via dd6154ca1986f7451cf13d952f22faab2673b00a (commit) via b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86 (commit) via 1902e39746ba23ef1918e3b14d96023966df (commit) via 17ce0c29ad6f344ac0e7f628028cf66a1cf19f55 (commit) via 752fa8be9d410907e1ecb80a6a21daacd1a666f9 (commit) via d040f3f1eee237ca8cb35d7055a348a7c06fa572 (commit) via 3ed8cffe73755f5267340d5b0abe8cb4e108e822 (commit) from 290ab79f61508bac4ce44b15d2b3e661c4c32c32 (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: CMakeLists.txt | 2 +- Source/cmAffinity.cxx| 2 + Source/cmGlobalGenerator.cxx | 11 ++-- Source/cmNinjaNormalTargetGenerator.cxx | 1 + Source/cmNinjaUtilityTargetGenerator.cxx | 3 ++ Tests/MakeClean/ToClean/CMakeLists.txt | 86 ++-- 6 files changed, 60 insertions(+), 45 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.15.2-829-g8a8b2fa
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 8a8b2fa695c477dff1e801bc7094dd1ee3352713 (commit)
via 2a2c4cc722769f4206aa44ca43edcd94cbb21028 (commit)
via 752fa8be9d410907e1ecb80a6a21daacd1a666f9 (commit)
via d040f3f1eee237ca8cb35d7055a348a7c06fa572 (commit)
via 3ed8cffe73755f5267340d5b0abe8cb4e108e822 (commit)
from 65fe80794d41ab6f0b1e608d7535b7530a2ff51d (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=8a8b2fa695c477dff1e801bc7094dd1ee3352713
commit 8a8b2fa695c477dff1e801bc7094dd1ee3352713
Merge: 2a2c4cc 752fa8b
Author: Brad King
AuthorDate: Tue Aug 27 14:16:22 2019 +
Commit: Kitware Robot
CommitDate: Tue Aug 27 10:17:20 2019 -0400
Merge topic 'libarchive-requirement'
752fa8be9d libarchive: We now require at least version 3.3.3
Acked-by: Kitware Robot
Merge-request: !3737
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a2c4cc722769f4206aa44ca43edcd94cbb21028
commit 2a2c4cc722769f4206aa44ca43edcd94cbb21028
Merge: 65fe807 d040f3f
Author: Brad King
AuthorDate: Tue Aug 27 14:15:56 2019 +
Commit: Kitware Robot
CommitDate: Tue Aug 27 10:16:05 2019 -0400
Merge topic 'ninja_additional_clean_files_custom_target'
d040f3f1ee Tests: Extend MakeClean test to test various target types
3ed8cffe73 Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets
Acked-by: Kitware Robot
Merge-request: !3739
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=752fa8be9d410907e1ecb80a6a21daacd1a666f9
commit 752fa8be9d410907e1ecb80a6a21daacd1a666f9
Author: Marvin Schmidt
AuthorDate: Sun Aug 25 23:12:36 2019 +0200
Commit: Brad King
CommitDate: Mon Aug 26 09:47:24 2019 -0400
libarchive: We now require at least version 3.3.3
It's the first version including Zstandard support.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51a1d8b..e60b6c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -511,7 +511,7 @@ macro (CMAKE_BUILD_UTILITIES)
#-
# Build or use system libarchive for CMake and CTest.
if(CMAKE_USE_SYSTEM_LIBARCHIVE)
-find_package(LibArchive 3.1.0)
+find_package(LibArchive 3.3.3)
if(NOT LibArchive_FOUND)
message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is
not found!")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d040f3f1eee237ca8cb35d7055a348a7c06fa572
commit d040f3f1eee237ca8cb35d7055a348a7c06fa572
Author: Sebastian Holtermann
AuthorDate: Mon Aug 26 12:48:27 2019 +0200
Commit: Brad King
CommitDate: Mon Aug 26 09:31:03 2019 -0400
Tests: Extend MakeClean test to test various target types
This extends the MakeClean test to test the target property
`ADDITIONAL_CLEAN_FILES` on executable, library and custom targets.
diff --git a/Tests/MakeClean/ToClean/CMakeLists.txt
b/Tests/MakeClean/ToClean/CMakeLists.txt
index 6f16d12..a05c38b 100644
--- a/Tests/MakeClean/ToClean/CMakeLists.txt
+++ b/Tests/MakeClean/ToClean/CMakeLists.txt
@@ -15,42 +15,45 @@ function(writeCleanFile FILENAME)
file(WRITE "${FILENAME}" ${CLEAN_FILE_CONTENT})
endfunction()
+set(DUMMY_CONTENT_FILE ${CSD}/toclean.cxx)
+
# Build a simple project whose compiled objects should be cleaned.
add_executable(toclean toclean.cxx)
-addCleanFile("${CBD}${CMAKE_FILES_DIRECTORY}/toclean.dir/toclean.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+addCleanFile(
+
"${CBD}${CMAKE_FILES_DIRECTORY}/toclean.dir/toclean.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
-# Create a post build custom command that copies the toclean output executable
+# Create a post build custom command that copies a dummy file
# to a custom location
-function(addToCleanPostBuildCopy FILENAME)
- add_custom_command(TARGET toclean POST_BUILD
+function(addPostBuildFile TARGET FILENAME)
+ add_custom_command(TARGET ${TARGET} POST_BUILD
COMMAND ${CMAKE_COMMAND}
-ARGS -E copy $ ${FILENAME})
+ARGS -E copy ${DUMMY_CONTENT_FILE} ${FILENAME})
endfunction()
# Create a custom command whose output should be cleaned.
set(CustomCommandFile "${CBD}/CustomCommandFile.txt")
add_custom_command(OUTPUT ${CustomCommandFile}
- DEPENDS ${CSD}/toclean.cxx
+ DEPENDS ${DUMMY_CONTENT_FILE}
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy ${CSD}/toclean.cxx ${CustomCommandFile})
-add_custom_target(generate ALL DEPENDS ${CustomCommandFile})
+ ARGS -E copy ${DUMMY_CONTENT_FILE} ${CustomCommandFile})
+add_custom_target(customTarget ALL DEPENDS ${CustomCommandFile})
[Cmake-commits] CMake branch, master, updated. v3.15.2-824-g65fe807
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 65fe80794d41ab6f0b1e608d7535b7530a2ff51d (commit) from 89479bde949b1ac33c37953ed768cd85b7d8109d (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=65fe80794d41ab6f0b1e608d7535b7530a2ff51d commit 65fe80794d41ab6f0b1e608d7535b7530a2ff51d Author: Kitware Robot AuthorDate: Tue Aug 27 00:01:03 2019 -0400 Commit: Kitware Robot CommitDate: Tue Aug 27 00:01:03 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 44b9164..f72c20b 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190826) +set(CMake_VERSION_PATCH 20190827) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-823-g89479bd
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 89479bde949b1ac33c37953ed768cd85b7d8109d (commit)
via 37c671570c4b344d66eb522ab2b63686550f993b (commit)
via 7fe3e874d59fb054a092738884157153c5550efc (commit)
via 74f2c0ea56fa3b9dce539fe8cbe0f0f7690b658d (commit)
via 7c2767ef3b575bc4b27d4d57ab9f2d5d1acbd3ce (commit)
via 303e81343804d5ef271a3669c1e6cac558055ca1 (commit)
via 51565abe7929f4baf5772345dc8d9c62ece9cf7a (commit)
via b1cfaf7b91f87fed0c70a6a7763d565023420788 (commit)
via 3f4c4e7afe6075b18f99c67cf808e2300b3690c4 (commit)
via a8ca5aea946e1154b4518ba28db3f4e695dbf165 (commit)
via 3b2b02825d88a045d08b8295927652cbcff408a8 (commit)
via a7aade84198343af9de79fda5c37560a2f9531a4 (commit)
via f6211f57d6b350dd8d701c19f80a0a458203e909 (commit)
from 8685d0d2911f01fb7e2d26a2fd904dbf73712ce4 (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=89479bde949b1ac33c37953ed768cd85b7d8109d
commit 89479bde949b1ac33c37953ed768cd85b7d8109d
Merge: 37c6715 7fe3e87
Author: Brad King
AuthorDate: Mon Aug 26 14:46:11 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:51:11 2019 -0400
Merge topic 'pvs-cleanup'
7fe3e874d5 cmCPackLog: Fix support for multiple log message tags
74f2c0ea56 cmCTestTestHandler: Remove extra layer of parentheses
7c2767ef3b cmCTestMultiProcessHandler: Explain testRun ownership in comments
303e813438 CTest: Simplify some boolean conditions
51565abe79 cmMessageCommand: Remove extra layer of parentheses
b1cfaf7b91 cmVSSetupHelper: Remove unused SmartBSTR copy operations
3f4c4e7afe cmVSSetupHelper: Fix SmartBSTR copy operations
a8ca5aea94 cmMakefileTargetGenerator: Check for null before using a pointer
...
Acked-by: Kitware Robot
Acked-by: Daniel Pfeifer
Acked-by: Artalus
Merge-request: !3715
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c671570c4b344d66eb522ab2b63686550f993b
commit 37c671570c4b344d66eb522ab2b63686550f993b
Merge: 8685d0d 3b2b028
Author: Brad King
AuthorDate: Mon Aug 26 14:37:11 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:49:10 2019 -0400
Merge topic 'source_sweep_ostringstream_single'
3b2b02825d Source sweep: Replace std::ostringstream when used with a single
append
Acked-by: Kitware Robot
Merge-request: !3726
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fe3e874d59fb054a092738884157153c5550efc
commit 7fe3e874d59fb054a092738884157153c5550efc
Author: Brad King
AuthorDate: Thu Aug 22 11:36:49 2019 -0400
Commit: Brad King
CommitDate: Mon Aug 26 09:43:46 2019 -0400
cmCPackLog: Fix support for multiple log message tags
Fix logic from commit bbf1c2d275 (ENH: More improvements and add
logging, 2006-01-02, v2.4.0~712) to append to the accumulated tag string
instead of overwriting it for each type of message.
Issue: #19610
diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx
index a3ca4b5..ca675fd 100644
--- a/Source/CPack/cmCPackLog.cxx
+++ b/Source/CPack/cmCPackLog.cxx
@@ -83,7 +83,7 @@ void cmCPackLog::Log(int tag, const char* file, int line,
const char* msg,
if (!tagString.empty()) {
tagString += ",";
}
- tagString = "VERBOSE";
+ tagString += "VERBOSE";
}
}
if (tag & LOG_WARNING) {
@@ -93,7 +93,7 @@ void cmCPackLog::Log(int tag, const char* file, int line,
const char* msg,
if (!tagString.empty()) {
tagString += ",";
}
- tagString = "WARNING";
+ tagString += "WARNING";
}
}
if (tag & LOG_ERROR) {
@@ -103,7 +103,7 @@ void cmCPackLog::Log(int tag, const char* file, int line,
const char* msg,
if (!tagString.empty()) {
tagString += ",";
}
- tagString = "ERROR";
+ tagString += "ERROR";
}
}
if (tag & LOG_DEBUG && this->Debug) {
@@ -113,7 +113,7 @@ void cmCPackLog::Log(int tag, const char* file, int line,
const char* msg,
if (!tagString.empty()) {
tagString += ",";
}
- tagString = "DEBUG";
+ tagString += "DEBUG";
}
useFileAndLine = true;
}
@@ -124,7 +124,7 @@ void cmCPackLog::Log(int tag, const char* file, int line,
const char* msg,
if (!tagString.empty()) {
tagString += ",";
}
- tagString = "VERBOSE";
+ tagString += "VERBOSE";
}
}
if (this->Quiet) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74f2c0ea56fa3b9dce539fe8cbe0f0f7690b658d
commit
[Cmake-commits] CMake branch, master, updated. v3.15.2-810-g8685d0d
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 8685d0d2911f01fb7e2d26a2fd904dbf73712ce4 (commit)
via 7290cea75bd0fe45e0862c6c3976caa3627be939 (commit)
via bd3fb4c4621f865e1210d9462298741fc92ca590 (commit)
via 8d019c096eab105e3a04587c4dfa4cd36c97a5bd (commit)
via 232f5bd644727fb092341621dd866a783f8d9e99 (commit)
via aaf59120bfd77a960317923da30e1a70ce0d8aae (commit)
via b14bcd9123b515c8e3919943b40cc4860996db75 (commit)
via 66c2714f2243c1a1f46b08cf35de7ea58224a541 (commit)
from 1811f2b3716e4067d8ce1a230948999d7d5b343d (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=8685d0d2911f01fb7e2d26a2fd904dbf73712ce4
commit 8685d0d2911f01fb7e2d26a2fd904dbf73712ce4
Merge: 7290cea aaf5912
Author: Brad King
AuthorDate: Mon Aug 26 14:37:04 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:47:24 2019 -0400
Merge topic 'source_sweep_cmExpandedList'
aaf59120bf Source sweep: Replace cmExpandList with the shorter
cmExpandedList
Acked-by: Kitware Robot
Merge-request: !3725
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7290cea75bd0fe45e0862c6c3976caa3627be939
commit 7290cea75bd0fe45e0862c6c3976caa3627be939
Merge: bd3fb4c 232f5bd
Author: Brad King
AuthorDate: Mon Aug 26 14:34:26 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:45:28 2019 -0400
Merge topic 'FindLibLZMA-windows-debug'
232f5bd644 FindLibLZMA: Find debug/release variants on Windows
Acked-by: Kitware Robot
Merge-request: !3714
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd3fb4c4621f865e1210d9462298741fc92ca590
commit bd3fb4c4621f865e1210d9462298741fc92ca590
Merge: 8d019c0 b14bcd9
Author: Brad King
AuthorDate: Mon Aug 26 14:35:39 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:43:06 2019 -0400
Merge topic 'list-subcommand-table'
b14bcd9123 cmListCommand: Use cmSubcommandTable
Acked-by: Kitware Robot
Merge-request: !3723
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d019c096eab105e3a04587c4dfa4cd36c97a5bd
commit 8d019c096eab105e3a04587c4dfa4cd36c97a5bd
Merge: 1811f2b 66c2714
Author: Brad King
AuthorDate: Mon Aug 26 14:35:33 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:40:30 2019 -0400
Merge topic 'string-subcommand-table'
66c2714f22 cmStringCommand: Use cmSubcommandTable
Acked-by: Kitware Robot
Merge-request: !3721
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=232f5bd644727fb092341621dd866a783f8d9e99
commit 232f5bd644727fb092341621dd866a783f8d9e99
Author: Braden McDaniel
AuthorDate: Wed Aug 21 20:41:28 2019 -0400
Commit: Braden McDaniel
CommitDate: Fri Aug 23 11:19:21 2019 -0400
FindLibLZMA: Find debug/release variants on Windows
diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake
index fc97655..200d6bf 100644
--- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake
@@ -42,7 +42,14 @@ This module will set the following variables in your project:
#]===]
find_path(LIBLZMA_INCLUDE_DIR lzma.h )
-find_library(LIBLZMA_LIBRARY NAMES lzma liblzma)
+if(NOT LIBLZMA_LIBRARY)
+ find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma PATH_SUFFIXES lib)
+ find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad PATH_SUFFIXES lib)
+ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+ select_library_configurations(LIBLZMA)
+else()
+ file(TO_CMAKE_PATH "${LIBLZMA_LIBRARY}" LIBLZMA_LIBRARY)
+endif()
if(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
file(STRINGS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h"
LIBLZMA_HEADER_CONTENTS REGEX "#define LZMA_VERSION_[A-Z]+ [0-9]+")
@@ -62,9 +69,17 @@ if (LIBLZMA_LIBRARY)
include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
set(CMAKE_REQUIRED_QUIET ${LibLZMA_FIND_QUIETLY})
- CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_auto_decoder ""
LIBLZMA_HAS_AUTO_DECODER)
- CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_easy_encoder ""
LIBLZMA_HAS_EASY_ENCODER)
- CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_lzma_preset ""
LIBLZMA_HAS_LZMA_PRESET)
+ if(NOT LIBLZMA_LIBRARY_RELEASE AND NOT LIBLZMA_LIBRARY_DEBUG)
+set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY})
+ elseif(LIBLZMA_LIBRARY_RELEASE)
+set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY_RELEASE})
+ elseif(LIBLZMA_LIBRARY_DEBUG)
+set(LIBLZMA_LIBRARY_check
[Cmake-commits] CMake branch, master, updated. v3.15.2-802-g1811f2b
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 1811f2b3716e4067d8ce1a230948999d7d5b343d (commit)
via e7d7cd47ed85678f29c18d63ef723f1a923d5742 (commit)
via 7d89c5bf77ab00273d30a7e88a9ea85d55e34854 (commit)
via f5a7ae0c4bcfa90fb530d69f9277290c5f947db2 (commit)
via 4c8741eb86c6a22298e815c4e34d3ccc0fffe1f4 (commit)
via 197c5e12adea2b7d72cf8bfa17e961b9428f5d57 (commit)
via 170fcd715f586cfd6b9f741c0572d472e0abe8ed (commit)
via 207926795971d260d602390fbd70e3cb78b4deb3 (commit)
via 2a71a0390c6c1130c9b50f717a751dc815310073 (commit)
from 4892f73d7428fbbe4bd11d4892590ec81eeff56b (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=1811f2b3716e4067d8ce1a230948999d7d5b343d
commit 1811f2b3716e4067d8ce1a230948999d7d5b343d
Merge: e7d7cd4 4c8741e
Author: Brad King
AuthorDate: Mon Aug 26 14:33:53 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:37:18 2019 -0400
Merge topic 'cpack-stgz-license-prompt'
4c8741eb86 CPack/STGZ: Require explicit acceptance or refusal of license
Acked-by: Kitware Robot
Merge-request: !3717
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7d7cd47ed85678f29c18d63ef723f1a923d5742
commit e7d7cd47ed85678f29c18d63ef723f1a923d5742
Merge: 7d89c5b 2a71a03
Author: Brad King
AuthorDate: Mon Aug 26 14:33:16 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:34:55 2019 -0400
Merge topic 'group_not_track'
2a71a0390c ctest: rename TRACK to GROUP
Acked-by: Kitware Robot
Acked-by: Zack Galbreath
Merge-request: !3707
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d89c5bf77ab00273d30a7e88a9ea85d55e34854
commit 7d89c5bf77ab00273d30a7e88a9ea85d55e34854
Merge: f5a7ae0 2079267
Author: Brad King
AuthorDate: Mon Aug 26 14:32:37 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:33:08 2019 -0400
Merge topic 'warnings_skip_color'
2079267959 ctest_build: ignore ANSI color
Acked-by: Kitware Robot
Merge-request: !3702
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5a7ae0c4bcfa90fb530d69f9277290c5f947db2
commit f5a7ae0c4bcfa90fb530d69f9277290c5f947db2
Merge: 4892f73 197c5e1
Author: Brad King
AuthorDate: Mon Aug 26 14:30:58 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:31:15 2019 -0400
Merge topic 'optional'
197c5e12ad Source: Add cm::optional
170fcd715f Extend C++17 feature checks to require std::optional
Acked-by: Kitware Robot
Acked-by: Sebastian Holtermann
Merge-request: !3644
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c8741eb86c6a22298e815c4e34d3ccc0fffe1f4
commit 4c8741eb86c6a22298e815c4e34d3ccc0fffe1f4
Author: sidju
AuthorDate: Fri Aug 23 05:15:27 2019 -0400
Commit: Brad King
CommitDate: Fri Aug 23 11:04:26 2019 -0400
CPack/STGZ: Require explicit acceptance or refusal of license
To make using the generated STGZ easier, require a specific answer to
accepting the license terms. Since more moves down one line when '\n'
is entered a user may hold enter to paginate through the document. This
change prevents the user from accidentally refusing the license terms by
holding enter for too long and having to start over.
diff --git a/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
index 003fcfe..a857aa5 100755
--- a/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
+++ b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
@@ -86,15 +86,19 @@ then
@CPACK_RESOURCE_FILE_LICENSE_CONTENT@
cpack__here_doc
echo
-echo "Do you accept the license? [yN]: "
-read line leftover
-case ${line} in
- y* | Y*)
-cpack_license_accepted=TRUE;;
- *)
-echo "License not accepted. Exiting ..."
-exit 1;;
-esac
+while true
+ do
+echo "Do you accept the license? [yn]: "
+read line leftover
+case ${line} in
+ y* | Y*)
+cpack_license_accepted=TRUE
+break;;
+ n* | N* | q* | Q* | e* | E*)
+echo "License not accepted. Exiting ..."
+exit 1;;
+esac
+ done
fi
if [ "x${cpack_include_subdir}x" = "xx" ]
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=197c5e12adea2b7d72cf8bfa17e961b9428f5d57
commit 197c5e12adea2b7d72cf8bfa17e961b9428f5d57
Author: Kyle Edwards
AuthorDate: Fri Aug 2 16:52:19 2019 -0400
Commit: Brad King
CommitDate: Fri Aug 23 08:43:35 2019 -0400
Source: Add cm::optional
[Cmake-commits] CMake branch, master, updated. v3.15.2-793-g4892f73
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 4892f73d7428fbbe4bd11d4892590ec81eeff56b (commit)
via 74eef37bc73cc012129ccc9b3a97a0e819c433b9 (commit)
via ed54d877894499319d67628b730053484e97049c (commit)
from 0d356e4c9490a104a02be657936132c080fc023b (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=4892f73d7428fbbe4bd11d4892590ec81eeff56b
commit 4892f73d7428fbbe4bd11d4892590ec81eeff56b
Merge: 0d356e4 74eef37
Author: Brad King
AuthorDate: Mon Aug 26 14:00:32 2019 +
Commit: Kitware Robot
CommitDate: Mon Aug 26 10:00:46 2019 -0400
Merge topic 'cmake-msvc-runtime-library'
74eef37bc7 Utilities/Release: Select MSVC runtime library via abstraction
ed54d87789 Configure CMake itself with policies through CMake 3.15
Acked-by: Kitware Robot
Merge-request: !3718
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74eef37bc73cc012129ccc9b3a97a0e819c433b9
commit 74eef37bc73cc012129ccc9b3a97a0e819c433b9
Author: Brad King
AuthorDate: Thu Aug 22 14:16:05 2019 -0400
Commit: Brad King
CommitDate: Fri Aug 23 10:55:59 2019 -0400
Utilities/Release: Select MSVC runtime library via abstraction
Use the `CMAKE_MSVC_RUNTIME_LIBRARY` abstraction added by CMake 3.15
instead of hard-coding the `-MT` flag.
diff --git a/Utilities/Release/win32_release.cmake
b/Utilities/Release/win32_release.cmake
index 468e5f4..f0f51b8 100644
--- a/Utilities/Release/win32_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -28,8 +28,7 @@ CMAKE_Fortran_COMPILER:FILEPATH=FALSE
CMAKE_GENERATOR:INTERNAL=Ninja
BUILD_QtDialog:BOOL=TRUE
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3
-CMAKE_C_FLAGS_RELEASE:STRING=-MT -O2 -Ob2 -DNDEBUG
-CMAKE_CXX_FLAGS_RELEASE:STRING=-MT -O2 -Ob2 -DNDEBUG
+CMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$:Debug>
CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x86 -subsystem:console,6.01
CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs}
CMAKE_PREFIX_PATH:STRING=${qt_prefix}
diff --git a/Utilities/Release/win64_release.cmake
b/Utilities/Release/win64_release.cmake
index 5a93ce6..149d378 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -28,8 +28,7 @@ CMAKE_Fortran_COMPILER:FILEPATH=FALSE
CMAKE_GENERATOR:INTERNAL=Ninja
BUILD_QtDialog:BOOL=TRUE
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3
-CMAKE_C_FLAGS_RELEASE:STRING=-MT -O2 -Ob2 -DNDEBUG
-CMAKE_CXX_FLAGS_RELEASE:STRING=-MT -O2 -Ob2 -DNDEBUG
+CMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$:Debug>
CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,6.01
CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs}
CMAKE_PREFIX_PATH:STRING=${qt_prefix}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed54d877894499319d67628b730053484e97049c
commit ed54d877894499319d67628b730053484e97049c
Author: Brad King
AuthorDate: Thu Aug 22 14:15:23 2019 -0400
Commit: Brad King
CommitDate: Fri Aug 23 10:55:58 2019 -0400
Configure CMake itself with policies through CMake 3.15
In particular, set `CMP0091` to `NEW` to enable the MSVC runtime library
abstraction so it can be set via `CMAKE_MSVC_RUNTIME_LIBRARY` in the
cache.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e3d39d..aa8a4c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,24 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
-cmake_minimum_required(VERSION 3.1...3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1...3.15 FATAL_ERROR)
set(CMAKE_USER_MAKE_RULES_OVERRIDE_C
${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules/OverrideC.cmake)
set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules/OverrideCXX.cmake)
project(CMake)
unset(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX)
unset(CMAKE_USER_MAKE_RULES_OVERRIDE_C)
+# FIXME: This block should go away after a transition period.
+if(MSVC AND NOT CMAKE_VERSION VERSION_LESS 3.15)
+ # Filter out MSVC runtime library flags that may have come from
+ # the cache of an existing build tree or from scripts.
+ foreach(l C CXX)
+foreach(c DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
+ string(REGEX REPLACE "[-/]M[DT]d?( |$)" "" "CMAKE_${l}_FLAGS_${c}"
"${CMAKE_${l}_FLAGS_${c}}")
+endforeach()
+ endforeach()
+endif()
+
# Make sure we can find internal find_package modules only used for
# building CMake and not for shipping externally
list(INSERT CMAKE_MODULE_PATH 0 ${CMake_SOURCE_DIR}/Source/Modules)
diff --git
[Cmake-commits] CMake branch, master, updated. v3.15.2-790-g0d356e4
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 0d356e4c9490a104a02be657936132c080fc023b (commit) from 2a1be178de5f12d55ec486609f4512e6b2b9d168 (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=0d356e4c9490a104a02be657936132c080fc023b commit 0d356e4c9490a104a02be657936132c080fc023b Author: Kitware Robot AuthorDate: Mon Aug 26 00:01:03 2019 -0400 Commit: Kitware Robot CommitDate: Mon Aug 26 00:01:03 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9cbfde9..44b9164 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190825) +set(CMake_VERSION_PATCH 20190826) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-789-g2a1be17
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 2a1be178de5f12d55ec486609f4512e6b2b9d168 (commit) from 395cbee2fce5a450d7909b218474dadbdb804d68 (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=2a1be178de5f12d55ec486609f4512e6b2b9d168 commit 2a1be178de5f12d55ec486609f4512e6b2b9d168 Author: Kitware Robot AuthorDate: Sun Aug 25 00:01:03 2019 -0400 Commit: Kitware Robot CommitDate: Sun Aug 25 00:01:03 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b01cdf5..9cbfde9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190824) +set(CMake_VERSION_PATCH 20190825) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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.15.2-788-g395cbee
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 395cbee2fce5a450d7909b218474dadbdb804d68 (commit) from 19612dffd27d90d73e3b7cff9cbba241294c17e9 (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=395cbee2fce5a450d7909b218474dadbdb804d68 commit 395cbee2fce5a450d7909b218474dadbdb804d68 Author: Kitware Robot AuthorDate: Sat Aug 24 00:01:12 2019 -0400 Commit: Kitware Robot CommitDate: Sat Aug 24 00:01:12 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index fdc482d..b01cdf5 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20190823) +set(CMake_VERSION_PATCH 20190824) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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, release, updated. v3.15.0-rc1-19-g95b9d6a
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 95b9d6af80d08e795cde9f94454d2431263dd084 (commit) via c1d6b135edb08431252c5deabc68a1361a2ee2e3 (commit) from 069e42f7c34e1a721fcc6101ba2f6827e07e855a (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: Source/QtDialog/CMakeSetupDialog.cxx | 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.15.0-rc1-68-gacc7da6
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 acc7da6351f9809b3fa91432e2de6e6b5043639f (commit) via 95b9d6af80d08e795cde9f94454d2431263dd084 (commit) from 82629cb377ff30a53fee49b9d6f8efd86a969c69 (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=acc7da6351f9809b3fa91432e2de6e6b5043639f commit acc7da6351f9809b3fa91432e2de6e6b5043639f Merge: 82629cb 95b9d6a Author: Craig Scott AuthorDate: Thu Jun 13 06:59:17 2019 -0400 Commit: Craig Scott CommitDate: Thu Jun 13 06:59:17 2019 -0400 Merge branch 'release-3.15' --- Summary of changes: 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.15.0-rc1-66-g82629cb
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 82629cb377ff30a53fee49b9d6f8efd86a969c69 (commit) via c1d6b135edb08431252c5deabc68a1361a2ee2e3 (commit) from d24121d62518d4ce8672737d83ef448e8b2a0ae6 (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=82629cb377ff30a53fee49b9d6f8efd86a969c69 commit 82629cb377ff30a53fee49b9d6f8efd86a969c69 Merge: d24121d c1d6b13 Author: Craig Scott AuthorDate: Thu Jun 13 10:54:39 2019 + Commit: Kitware Robot CommitDate: Thu Jun 13 06:55:18 2019 -0400 Merge topic 'cmake-gui-qt-notice' c1d6b135ed cmake-gui: Update Qt copyright holder in About dialog Acked-by: Kitware Robot Merge-request: !3441 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1d6b135edb08431252c5deabc68a1361a2ee2e3 commit c1d6b135edb08431252c5deabc68a1361a2ee2e3 Author: Brad King AuthorDate: Wed Jun 12 12:39:25 2019 -0400 Commit: Brad King CommitDate: Wed Jun 12 12:39:25 2019 -0400 cmake-gui: Update Qt copyright holder in About dialog Qt is now copyright "The Qt Company Ltd.". diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 5f6ccca..e98cdcf 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -862,7 +862,7 @@ void CMakeSetupDialog::doAbout() "built using Qt %2 (qt-project.org).\n" #ifdef USE_LGPL "\n" -"The Qt Toolkit is Copyright (C) Digia Plc and/or its subsidiary(-ies).\n" +"The Qt Toolkit is Copyright (C) The Qt Company Ltd.\n" "Qt is licensed under terms of the GNU LGPLv" USE_LGPL ", available at:\n" " \"%3\"" #endif --- Summary of changes: Source/QtDialog/CMakeSetupDialog.cxx | 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.15.0-rc1-64-gd24121d
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 d24121d62518d4ce8672737d83ef448e8b2a0ae6 (commit) from f07200fe163640f708c62de3cbdc0fb49a7e0471 (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=d24121d62518d4ce8672737d83ef448e8b2a0ae6 commit d24121d62518d4ce8672737d83ef448e8b2a0ae6 Author: Kitware Robot AuthorDate: Thu Jun 13 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Thu Jun 13 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 55e4455..63cb1c6 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 15) -set(CMake_VERSION_PATCH 20190612) +set(CMake_VERSION_PATCH 20190613) #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.15.0-rc1-63-gf07200f
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 f07200fe163640f708c62de3cbdc0fb49a7e0471 (commit)
via c1580ecc13cf2dea3f047d1018e705bd34cecc53 (commit)
via 1af08229a7b871ea592cdf6d2aa41e47787eb713 (commit)
via 00d265e3c812516e2a71faed4f352b36f51112e2 (commit)
via 1b945f95bafc9a795b092904f7c6bd84dad940e8 (commit)
via e0a8ff31480df672e42e2382e8ed7f33ea65afb4 (commit)
via 8d934d861be8c2a8b43d4c421715fb1e8c0c54fd (commit)
via 026f65d284deaea9f2dba41ed956fabf84e17b6d (commit)
via 9e64e617eb295c7e2725d871225659ae7bcf7c48 (commit)
via e791ffac61912f6540742aabaf4cb78a4d475a16 (commit)
via a982916304fc7a66edb7a587144cb192f13ef6be (commit)
from 00132e60a6b85d12a6614d773e8d0d86810ede76 (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=f07200fe163640f708c62de3cbdc0fb49a7e0471
commit f07200fe163640f708c62de3cbdc0fb49a7e0471
Merge: c1580ec e791ffa
Author: Brad King
AuthorDate: Wed Jun 12 16:48:04 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:48:13 2019 -0400
Merge topic 'add-test-command-expand-lists'
e791ffac61 add_test: Add COMMAND_EXPAND_LISTS option
Acked-by: Kitware Robot
Merge-request: !3422
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1580ecc13cf2dea3f047d1018e705bd34cecc53
commit c1580ecc13cf2dea3f047d1018e705bd34cecc53
Merge: 1af0822 00d265e
Author: Brad King
AuthorDate: Wed Jun 12 16:45:55 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:46:18 2019 -0400
Merge topic 'cmPropertyMap_unordered_map'
00d265e3c8 cmPropertyMap: Use std::unordered_map as container instead of
std::map
1b945f95ba cmPropertyMap: Add RemoveProperty method
e0a8ff3148 cmPropertyMap: Use std::string as value container class
8d934d861b cmPropertyMap: Make std::map container private
026f65d284 cmPropertyMap: Add GetList method
9e64e617eb cmPropertyMap: Rename GetPropertyList method to GetKeys
Acked-by: Kitware Robot
Merge-request: !3435
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af08229a7b871ea592cdf6d2aa41e47787eb713
commit 1af08229a7b871ea592cdf6d2aa41e47787eb713
Merge: 00132e6 a982916
Author: Brad King
AuthorDate: Wed Jun 12 16:44:56 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:45:15 2019 -0400
Merge topic 'language-dependent-linker-flags'
a982916304 Support per-language library link flags
Acked-by: Kitware Robot
Merge-request: !3429
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00d265e3c812516e2a71faed4f352b36f51112e2
commit 00d265e3c812516e2a71faed4f352b36f51112e2
Author: Sebastian Holtermann
AuthorDate: Mon Jun 3 10:29:12 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Sat Jun 8 12:25:35 2019 +0200
cmPropertyMap: Use std::unordered_map as container instead of std::map
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index 64bceb5..3ed4c05 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmPropertyMap.h"
+#include
#include
void cmPropertyMap::Clear()
@@ -59,15 +60,21 @@ std::vector cmPropertyMap::GetKeys() const
for (auto const& item : Map_) {
keyList.push_back(item.first);
}
+ std::sort(keyList.begin(), keyList.end());
return keyList;
}
std::vector> cmPropertyMap::GetList() const
{
- std::vector> kvList;
+ typedef std::pair StringPair;
+ std::vector kvList;
kvList.reserve(Map_.size());
for (auto const& item : Map_) {
kvList.emplace_back(item.first, item.second);
}
+ std::sort(kvList.begin(), kvList.end(),
+[](StringPair const& a, StringPair const& b) {
+ return a.first < b.first;
+});
return kvList;
}
diff --git a/Source/cmPropertyMap.h b/Source/cmPropertyMap.h
index 6284e8c..9aed349 100644
--- a/Source/cmPropertyMap.h
+++ b/Source/cmPropertyMap.h
@@ -5,11 +5,14 @@
#include "cmConfigure.h" // IWYU pragma: keep
-#include
#include
+#include
#include
#include
+/** \class cmPropertyMap
+ * \brief String property map.
+ */
class cmPropertyMap
{
public:
@@ -34,6 +37,7 @@ public:
void RemoveProperty(const std::string& name);
// -- Lists
+
//! Get a sorted list of property keys
std::vector GetKeys() const;
@@ -41,7 +45,7 @@ public:
std::vector> GetList() const;
private:
- std::map Map_;
+ std::unordered_map Map_;
};
#endif
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-17-g069e42f
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 069e42f7c34e1a721fcc6101ba2f6827e07e855a (commit) via f26c3d5c6056f6920f6082b97e06d55c34ddfbcf (commit) via fa00a3b29bdc962429af13c64f11b51fee8c58bb (commit) via c932f498426609beb14b9339c2a7dec3ea624998 (commit) via 6696855f72adebbb40d475c39dace1e9f855ca2a (commit) via 6b815e58baa037335fb0008f6d0345fa29931e08 (commit) from 8d3c919a3cbef7d92f24409fa7a5737e835957ee (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: Help/manual/cmake-file-api.7.rst | 2 + Help/manual/cmake.1.rst| 16 ++ Modules/CheckCXXSymbolExists.cmake | 2 +- Source/cmFileAPI.cxx | 63 +- Source/cmFileAPI.h | 5 ++ Source/cmServerProtocol.cxx| 2 +- Source/cmake.cxx | 9 ++-- Source/cmake.h | 4 +- Source/cmcmd.cxx | 6 +-- .../RunCMake/CommandLine/E_capabilities-stdout.txt | 2 +- 10 files changed, 83 insertions(+), 28 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.15.0-rc1-52-g00132e6
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 00132e60a6b85d12a6614d773e8d0d86810ede76 (commit) via 069e42f7c34e1a721fcc6101ba2f6827e07e855a (commit) via 445c7bc219aeeb2c8684ba920bec0bd05db915d2 (commit) via f26c3d5c6056f6920f6082b97e06d55c34ddfbcf (commit) via 49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 (commit) via fa00a3b29bdc962429af13c64f11b51fee8c58bb (commit) from 1492dc8301ba5844b830316bcc2677aa1bdae897 (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=00132e60a6b85d12a6614d773e8d0d86810ede76 commit 00132e60a6b85d12a6614d773e8d0d86810ede76 Merge: 445c7bc 069e42f Author: Brad King AuthorDate: Wed Jun 12 11:51:26 2019 -0400 Commit: Brad King CommitDate: Wed Jun 12 11:51:26 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=445c7bc219aeeb2c8684ba920bec0bd05db915d2 commit 445c7bc219aeeb2c8684ba920bec0bd05db915d2 Merge: 49b1a28 f26c3d5 Author: Brad King AuthorDate: Wed Jun 12 15:50:08 2019 + Commit: Kitware Robot CommitDate: Wed Jun 12 11:50:16 2019 -0400 Merge topic 'CheckCXXSymbolExists-xref' f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version Acked-by: Kitware Robot Merge-request: !3437 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 commit 49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 Merge: 1492dc8 fa00a3b Author: Brad King AuthorDate: Wed Jun 12 11:43:20 2019 -0400 Commit: Brad King CommitDate: Wed Jun 12 11:43:20 2019 -0400 Merge branch 'release-3.15' --- Summary of changes: Modules/CheckCXXSymbolExists.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.15.0-rc1-46-g1492dc8
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 1492dc8301ba5844b830316bcc2677aa1bdae897 (commit)
via c932f498426609beb14b9339c2a7dec3ea624998 (commit)
via 6696855f72adebbb40d475c39dace1e9f855ca2a (commit)
via 6b815e58baa037335fb0008f6d0345fa29931e08 (commit)
from b7d72db89de6a9ddc8c8740a6e8b8980d108b900 (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=1492dc8301ba5844b830316bcc2677aa1bdae897
commit 1492dc8301ba5844b830316bcc2677aa1bdae897
Merge: b7d72db c932f49
Author: Brad King
AuthorDate: Wed Jun 12 15:40:33 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 11:40:47 2019 -0400
Merge topic 'capabilities-fileapi'
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests
6696855f72 cmake: Simplify implementation of -E capabilities
6b815e58ba fileapi: Factor out helper to construct a version object
Acked-by: Kitware Robot
Merge-request: !3433
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c932f498426609beb14b9339c2a7dec3ea624998
commit c932f498426609beb14b9339c2a7dec3ea624998
Author: Brad King
AuthorDate: Fri Jun 7 10:22:34 2019 -0400
Commit: Brad King
CommitDate: Fri Jun 7 11:08:38 2019 -0400
cmake: Teach -E capabilities to report supported fileapi requests
Fixes: #19339
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index f3e0208..04b6ed2 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -379,6 +379,8 @@ finds the file missing, that means a concurrent CMake has
generated
a new reply. The client may simply start again by reading the new
reply index file.
+.. _`file-api object kinds`:
+
Object Kinds
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index f1d02eb..13cba71 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -423,6 +423,22 @@ Available commands are:
A list of strings with all the extra generators compatible with
the generator.
+ ``fileApi``
+Optional member that is present when the :manual:`cmake-file-api(7)`
+is available. The value is a JSON object with one member:
+
+``requests``
+ A JSON array containing zero or more supported file-api requests.
+ Each request is a JSON object with members:
+
+ ``kind``
+Specifies one of the supported :ref:`file-api object kinds`.
+
+ ``version``
+A JSON array whose elements are each a JSON object containing
+``major`` and ``minor`` members specifying non-negative integer
+version components.
+
``serverMode``
``true`` if cmake supports server-mode and ``false`` otherwise.
diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx
index 9cb484c..ed45398 100644
--- a/Source/cmFileAPI.cxx
+++ b/Source/cmFileAPI.cxx
@@ -801,3 +801,35 @@ Json::Value cmFileAPI::BuildInternalTest(Object const&
object)
}
return test;
}
+
+Json::Value cmFileAPI::ReportCapabilities()
+{
+ Json::Value capabilities = Json::objectValue;
+ Json::Value& requests = capabilities["requests"] = Json::arrayValue;
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::CodeModel);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(2, CodeModelV2Minor));
+requests.append(std::move(request));
+ }
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::Cache);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(2, CacheV2Minor));
+requests.append(std::move(request));
+ }
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::CMakeFiles);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(1, CMakeFilesV1Minor));
+requests.append(std::move(request));
+ }
+
+ return capabilities;
+}
diff --git a/Source/cmFileAPI.h b/Source/cmFileAPI.h
index 1315532..602efa8 100644
--- a/Source/cmFileAPI.h
+++ b/Source/cmFileAPI.h
@@ -36,6 +36,9 @@ public:
and holding the original object. Other JSON types are unchanged. */
Json::Value MaybeJsonFile(Json::Value in, std::string const& prefix);
+ /** Report file-api capabilities for cmake -E capabilities. */
+ static Json::Value ReportCapabilities();
+
private:
cmake* CMakeInstance;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 0dca578..3772f09 100644
--- a/Source/cmake.cxx
+++
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-42-gb7d72db
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 b7d72db89de6a9ddc8c8740a6e8b8980d108b900 (commit) from 14254e9ea8ea3efc6d67aa2bf6e29e5d4fbafe4b (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=b7d72db89de6a9ddc8c8740a6e8b8980d108b900 commit b7d72db89de6a9ddc8c8740a6e8b8980d108b900 Author: Kitware Robot AuthorDate: Wed Jun 12 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Wed Jun 12 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 33aef1e..55e4455 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 15) -set(CMake_VERSION_PATCH 20190611) +set(CMake_VERSION_PATCH 20190612) #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.15.0-rc1-38-g7c0a542
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 7c0a542cf17169d41abdb868d6daa1e0fc51bb81 (commit) from f36719111de99e5be426552e9aaba96518b888b7 (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=7c0a542cf17169d41abdb868d6daa1e0fc51bb81 commit 7c0a542cf17169d41abdb868d6daa1e0fc51bb81 Author: Kitware Robot AuthorDate: Tue Jun 11 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Tue Jun 11 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 732f80a..33aef1e 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 15) -set(CMake_VERSION_PATCH 20190610) +set(CMake_VERSION_PATCH 20190611) #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.15.0-rc1-37-gf367191
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 f36719111de99e5be426552e9aaba96518b888b7 (commit) from d443b86e58de53fe367f642a91eb5f52c7cec22b (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=f36719111de99e5be426552e9aaba96518b888b7 commit f36719111de99e5be426552e9aaba96518b888b7 Author: Kitware Robot AuthorDate: Mon Jun 10 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Mon Jun 10 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8ab22fe..732f80a 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 15) -set(CMake_VERSION_PATCH 20190609) +set(CMake_VERSION_PATCH 20190610) #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.15.0-rc1-36-gd443b86
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 d443b86e58de53fe367f642a91eb5f52c7cec22b (commit) from f4bbeb785c8f673a5cff326cc717d0dfbb2734a2 (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=d443b86e58de53fe367f642a91eb5f52c7cec22b commit d443b86e58de53fe367f642a91eb5f52c7cec22b Author: Kitware Robot AuthorDate: Sun Jun 9 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Sun Jun 9 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 991b9f5..8ab22fe 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 15) -set(CMake_VERSION_PATCH 20190608) +set(CMake_VERSION_PATCH 20190609) #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.15.0-rc1-35-gf4bbeb7
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 f4bbeb785c8f673a5cff326cc717d0dfbb2734a2 (commit) via 8d3c919a3cbef7d92f24409fa7a5737e835957ee (commit) from d93fe90c17de741c3986c3b13a6c5f5653a8104e (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=f4bbeb785c8f673a5cff326cc717d0dfbb2734a2 commit f4bbeb785c8f673a5cff326cc717d0dfbb2734a2 Merge: d93fe90 8d3c919 Author: Craig Scott AuthorDate: Sat Jun 8 16:59:49 2019 +1000 Commit: Craig Scott CommitDate: Sat Jun 8 16:59:49 2019 +1000 Merge branch 'release-3.15' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-11-g8d3c919
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 8d3c919a3cbef7d92f24409fa7a5737e835957ee (commit) via e61074c67226e3def13e75173e3b8bbdb1c3df2d (commit) via cebccdebaf12adc83c50f418c51b2d6b989d5350 (commit) from 43316424d0f33d6dc12ae5d1d4528603e8f0fab9 (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: Help/manual/cmake-properties.7.rst | 2 +- Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst | 15 ++- Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst | 17 - 3 files changed, 23 insertions(+), 11 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.15.0-rc1-33-gd93fe90
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 d93fe90c17de741c3986c3b13a6c5f5653a8104e (commit) via e61074c67226e3def13e75173e3b8bbdb1c3df2d (commit) via cebccdebaf12adc83c50f418c51b2d6b989d5350 (commit) from 0e96fdbc15471b652fe9e242ab4ff1e1dc87d8dc (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=d93fe90c17de741c3986c3b13a6c5f5653a8104e commit d93fe90c17de741c3986c3b13a6c5f5653a8104e Merge: 0e96fdb e61074c Author: Craig Scott AuthorDate: Sat Jun 8 06:52:53 2019 + Commit: Kitware Robot CommitDate: Sat Jun 8 02:53:21 2019 -0400 Merge topic 'additional_clean_files_help' e61074c672 Help: Improve ADDITIONAL_CLEAN_FILES documentation cebccdebaf Help: Move ADDITIONAL_MAKE_CLEAN_FILES dir prop to deprecated section Acked-by: Kitware Robot Merge-request: !3428 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e61074c67226e3def13e75173e3b8bbdb1c3df2d commit e61074c67226e3def13e75173e3b8bbdb1c3df2d Author: Sebastian Holtermann AuthorDate: Wed Jun 5 16:26:27 2019 +0200 Commit: Craig Scott CommitDate: Fri Jun 7 21:10:19 2019 +1000 Help: Improve ADDITIONAL_CLEAN_FILES documentation Extend the `ADDITIONAL_CLEAN_FILES' target and directory property documentation. Fixes: #19341 diff --git a/Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst b/Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst index 54a78ef..051d22a 100644 --- a/Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst +++ b/Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst @@ -1,16 +1,21 @@ ADDITIONAL_CLEAN_FILES -- -Additional files to remove during the clean stage. +A :ref:`;-list ` of files or directories that will be +removed as a part of the global ``clean`` target. It is useful for +specifying generated files or directories that are used by multiple targets +or by CMake itself, or that are generated in ways which cannot be captured as +outputs or byproducts of custom commands. -A :ref:`;-list ` of files that will be removed as a -part of the ``clean`` target. +If an additional clean file is specific to a single target only, then the +:prop_tgt:`ADDITIONAL_CLEAN_FILES` target property would usually be a better +choice than this directory property. Relative paths are allowed and are interpreted relative to the current binary directory. -Arguments to :prop_dir:`ADDITIONAL_CLEAN_FILES` may use +Contents of ``ADDITIONAL_CLEAN_FILES`` may use :manual:`generator expressions `. This property only works for the :generator:`Ninja` and the Makefile -generators. It is ignored on other generators. +generators. It is ignored by other generators. diff --git a/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst b/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst index 856bb38..3b9d965 100644 --- a/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst +++ b/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst @@ -1,16 +1,23 @@ ADDITIONAL_CLEAN_FILES -- -Additional files to remove during the clean stage. +A :ref:`;-list ` of files or directories that will be +removed as a part of the global ``clean`` target. It can be used to specify +files and directories that are generated as part of building the target or +that are directly associated with the target in some way (e.g. created as a +result of running the target). -A :ref:`;-list ` of files that will be removed as a -part of the ``clean`` target. +For custom targets, if such files can be captured as outputs or byproducts +instead, then that should be preferred over adding them to this property. +If an additional clean file is used by multiple targets or isn't +target-specific, then the :prop_dir:`ADDITIONAL_CLEAN_FILES` directory +property may be the more appropriate property to use. Relative paths are allowed and are interpreted relative to the current binary directory. -Arguments to :prop_tgt:`ADDITIONAL_CLEAN_FILES` may use +Contents of ``ADDITIONAL_CLEAN_FILES`` may use :manual:`generator expressions `. This property only works for the :generator:`Ninja` and the Makefile -generators. It is ignored on other generators. +generators. It is ignored by other generators. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cebccdebaf12adc83c50f418c51b2d6b989d5350 commit cebccdebaf12adc83c50f418c51b2d6b989d5350 Author: Craig Scott AuthorDate: Fri Jun 7 21:08:08 2019 +1000 Commit: Craig Scott CommitDate: Fri Jun 7 21:08:08 2019 +1000 Help: Move ADDITIONAL_MAKE_CLEAN_FILES dir prop to deprecated section diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-30-g0e96fdb
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 0e96fdbc15471b652fe9e242ab4ff1e1dc87d8dc (commit) from 891b5559517b4027147f6d94a139953bdc687668 (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=0e96fdbc15471b652fe9e242ab4ff1e1dc87d8dc commit 0e96fdbc15471b652fe9e242ab4ff1e1dc87d8dc Author: Kitware Robot AuthorDate: Sat Jun 8 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Sat Jun 8 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 07def95..991b9f5 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 15) -set(CMake_VERSION_PATCH 20190607) +set(CMake_VERSION_PATCH 20190608) #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.15.0-rc1-29-g891b555
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 891b5559517b4027147f6d94a139953bdc687668 (commit) via 43316424d0f33d6dc12ae5d1d4528603e8f0fab9 (commit) via 8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a (commit) via 00e6b67e0c89ca25c5efd78f4a4b27fa53b64e77 (commit) from e2414ee13d1fad8b6775581d01975109c9867854 (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=891b5559517b4027147f6d94a139953bdc687668 commit 891b5559517b4027147f6d94a139953bdc687668 Merge: 8be4b17 4331642 Author: Brad King AuthorDate: Fri Jun 7 11:16:30 2019 -0400 Commit: Brad King CommitDate: Fri Jun 7 11:16:30 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a commit 8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a Merge: e2414ee 00e6b67 Author: Brad King AuthorDate: Fri Jun 7 15:14:11 2019 + Commit: Kitware Robot CommitDate: Fri Jun 7 11:14:20 2019 -0400 Merge topic 'autogen_header_in_symbolic_path_fix' 00e6b67e0c Autogen: Fix header detection for paths with symbolic links Acked-by: Kitware Robot Merge-request: !3431 --- Summary of changes: Source/cmQtAutoGenInitializer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-8-g4331642
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 43316424d0f33d6dc12ae5d1d4528603e8f0fab9 (commit) via 00e6b67e0c89ca25c5efd78f4a4b27fa53b64e77 (commit) from 1f466935da2b04862307d126da0cf4d6b604d613 (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: Source/cmQtAutoGenInitializer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 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.15.0-rc1-25-ge2414ee
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 e2414ee13d1fad8b6775581d01975109c9867854 (commit) from 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 (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=e2414ee13d1fad8b6775581d01975109c9867854 commit e2414ee13d1fad8b6775581d01975109c9867854 Author: Kitware Robot AuthorDate: Fri Jun 7 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Jun 7 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 381fbe3..07def95 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 15) -set(CMake_VERSION_PATCH 20190606) +set(CMake_VERSION_PATCH 20190607) #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.15.0-rc1-24-g0b3ba05
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 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 (commit)
via 0e4493ec67865123d43034ef9bf1bd4919c705b1 (commit)
via f1bdfdf2425d544b0cf897de626422ad3fa9e1e7 (commit)
via 8af4b31b8ac44c87629fabec22d87e1e6e41f73f (commit)
via 537ea119b9d65d8723b6df8a7ba71f29466c0f63 (commit)
via c4826787d50d02a8e403b99b589a35875e7d7f23 (commit)
from 6aee82f325df2332b5c7563c3e10b3253ae851c1 (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=0b3ba05a9beada98e8e97445acef7ef2f4efb3e3
commit 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3
Merge: 6aee82f 0e4493e
Author: Brad King
AuthorDate: Thu Jun 6 18:07:12 2019 +
Commit: Kitware Robot
CommitDate: Thu Jun 6 14:07:23 2019 -0400
Merge topic 'cmTarget_cleanups'
0e4493ec67 cmOutputConverter: Initialize static std::set on construction
f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on
construction
8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set
on construction
537ea119b9 cmTarget: Initialize static std::unordered_set on construction
c4826787d5 cmTarget: Property initialization cleanup
Acked-by: Kitware Robot
Merge-request: !3416
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e4493ec67865123d43034ef9bf1bd4919c705b1
commit 0e4493ec67865123d43034ef9bf1bd4919c705b1
Author: Sebastian Holtermann
AuthorDate: Tue Jun 4 12:24:44 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Tue Jun 4 18:11:19 2019 +0200
cmOutputConverter: Initialize static std::set on construction
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 7d88b08..d7bcf7e 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -73,22 +73,10 @@ std::string
cmOutputConverter::ConvertDirectorySeparatorsForShell(
static bool cmOutputConverterIsShellOperator(const std::string& str)
{
- static std::set shellOperators;
- if (shellOperators.empty()) {
-shellOperators.insert("<");
-shellOperators.insert(">");
-shellOperators.insert("<<");
-shellOperators.insert(">>");
-shellOperators.insert("|");
-shellOperators.insert("||");
-shellOperators.insert("&&");
-shellOperators.insert("&>");
-shellOperators.insert("1>");
-shellOperators.insert("2>");
-shellOperators.insert("2>&1");
-shellOperators.insert("1>&2");
- }
- return shellOperators.count(str) > 0;
+ static std::set const shellOperators{
+"<", ">", "<<", ">>", "|", "||", "&&", "&>", "1>", "2>", "2>&1", "1>&2"
+ };
+ return (shellOperators.count(str) != 0);
}
std::string cmOutputConverter::EscapeForShell(const std::string& str,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1bdfdf2425d544b0cf897de626422ad3fa9e1e7
commit f1bdfdf2425d544b0cf897de626422ad3fa9e1e7
Author: Sebastian Holtermann
AuthorDate: Tue Jun 4 12:19:59 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Tue Jun 4 18:11:19 2019 +0200
cmAddCustomCommand: Initialize static std::unordered_set on construction
diff --git a/Source/cmAddCustomCommandCommand.cxx
b/Source/cmAddCustomCommandCommand.cxx
index 0be3c85..6eb38bd 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -95,30 +95,29 @@ bool cmAddCustomCommandCommand::InitialPass(
MAKE_STATIC_KEYWORD(VERBATIM);
MAKE_STATIC_KEYWORD(WORKING_DIRECTORY);
#undef MAKE_STATIC_KEYWORD
- static std::unordered_set keywords;
- if (keywords.empty()) {
-keywords.insert(keyAPPEND);
-keywords.insert(keyARGS);
-keywords.insert(keyBYPRODUCTS);
-keywords.insert(keyCOMMAND);
-keywords.insert(keyCOMMAND_EXPAND_LISTS);
-keywords.insert(keyCOMMENT);
-keywords.insert(keyDEPENDS);
-keywords.insert(keyDEPFILE);
-keywords.insert(keyIMPLICIT_DEPENDS);
-keywords.insert(keyJOB_POOL);
-keywords.insert(keyMAIN_DEPENDENCY);
-keywords.insert(keyOUTPUT);
-keywords.insert(keyOUTPUTS);
-keywords.insert(keyPOST_BUILD);
-keywords.insert(keyPRE_BUILD);
-keywords.insert(keyPRE_LINK);
-keywords.insert(keySOURCE);
-keywords.insert(keyTARGET);
-keywords.insert(keyUSES_TERMINAL);
-keywords.insert(keyVERBATIM);
-keywords.insert(keyWORKING_DIRECTORY);
- }
+ static std::unordered_set const keywords{
+keyAPPEND,
+keyARGS,
+keyBYPRODUCTS,
+keyCOMMAND,
+keyCOMMAND_EXPAND_LISTS,
+keyCOMMENT,
+keyDEPENDS,
+keyDEPFILE,
+keyIMPLICIT_DEPENDS,
+keyJOB_POOL,
+keyMAIN_DEPENDENCY,
+keyOUTPUT,
+
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-6-g1f46693
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 1f466935da2b04862307d126da0cf4d6b604d613 (commit) via 923f58ec735575a3e81f017c5dcdecb15f44a668 (commit) via 501a3cf195fc8b189d310c499d37ade63a7abb1d (commit) via 8a4732c60e5cb2137fa824605e4668f3229a9684 (commit) from 556277eb100c2fa061677a59be33eb71876a2a72 (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: Help/variable/CMAKE_LANG_COMPILER_ID.rst | 1 + Modules/Internal/CPack/CPackNuGet.cmake | 2 +- 2 files changed, 2 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.15.0-rc1-13-gbaf3a84
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 baf3a84eff415be8691724153a10031401321d0f (commit)
via 8a4732c60e5cb2137fa824605e4668f3229a9684 (commit)
from 9ef92b7d7d577350cc67c7762112b6056adef34d (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=baf3a84eff415be8691724153a10031401321d0f
commit baf3a84eff415be8691724153a10031401321d0f
Merge: 9ef92b7 8a4732c
Author: Brad King
AuthorDate: Thu Jun 6 14:32:02 2019 +
Commit: Kitware Robot
CommitDate: Thu Jun 6 10:32:10 2019 -0400
Merge topic 'cpack-nuget-case'
8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system
Acked-by: Kitware Robot
Acked-by: Mathieu Malaterre
Merge-request: !3427
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a4732c60e5cb2137fa824605e4668f3229a9684
commit 8a4732c60e5cb2137fa824605e4668f3229a9684
Author: Mathieu Malaterre
AuthorDate: Wed Jun 5 10:17:21 2019 +0200
Commit: Brad King
CommitDate: Wed Jun 5 09:32:22 2019 -0400
CPack/NuGet: Find nuget tool on case sensitive file system
There is no need to use a CamelCase executable name since it will be
handled gracefully on Windows anyway. This change allow support for
Linux system, in particular Debian distribution where the binary is
called `nuget`.
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake
b/Modules/Internal/CPack/CPackNuGet.cmake
index 198ccad..4b2ce92 100644
--- a/Modules/Internal/CPack/CPackNuGet.cmake
+++ b/Modules/Internal/CPack/CPackNuGet.cmake
@@ -276,7 +276,7 @@ function(_cpack_nuget_make_files_tag)
set(_CPACK_NUGET_FILES_TAG "\n${_files}" PARENT_SCOPE)
endfunction()
-find_program(NUGET_EXECUTABLE NuGet)
+find_program(NUGET_EXECUTABLE nuget)
_cpack_nuget_debug_var(NUGET_EXECUTABLE)
if(NOT NUGET_EXECUTABLE)
message(FATAL_ERROR "NuGet executable not found")
---
Summary of changes:
Modules/Internal/CPack/CPackNuGet.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.15.0-rc1-11-g9ef92b7
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 9ef92b7d7d577350cc67c7762112b6056adef34d (commit) from 8c704cfad4deee359fb65cd49a7cf4686130d8ea (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=9ef92b7d7d577350cc67c7762112b6056adef34d commit 9ef92b7d7d577350cc67c7762112b6056adef34d Author: Kitware Robot AuthorDate: Thu Jun 6 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Thu Jun 6 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c0b209c..381fbe3 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 15) -set(CMake_VERSION_PATCH 20190605) +set(CMake_VERSION_PATCH 20190606) #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.15.0-rc1-10-g8c704cf
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 8c704cfad4deee359fb65cd49a7cf4686130d8ea (commit) via 8a07d511afdae53047ba23d257851753ed6eb858 (commit) via 556277eb100c2fa061677a59be33eb71876a2a72 (commit) via 15de26c7f307fe33c4284e7573154cb47bb19ec4 (commit) from 6ca497365af59106976fd3cc0bff8357c6794522 (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=8c704cfad4deee359fb65cd49a7cf4686130d8ea commit 8c704cfad4deee359fb65cd49a7cf4686130d8ea Merge: 8a07d51 556277e Author: Brad King AuthorDate: Wed Jun 5 10:01:14 2019 -0400 Commit: Brad King CommitDate: Wed Jun 5 10:01:14 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a07d511afdae53047ba23d257851753ed6eb858 commit 8a07d511afdae53047ba23d257851753ed6eb858 Merge: 6ca4973 15de26c Author: Brad King AuthorDate: Wed Jun 5 13:59:25 2019 + Commit: Kitware Robot CommitDate: Wed Jun 5 09:59:33 2019 -0400 Merge topic 'doc-FindEnvModule-typos' 15de26c7f3 Help: Trivial typo and grammar fixes for FindEnvModules Acked-by: Kitware Robot Merge-request: !3425 --- Summary of changes: Modules/FindEnvModules.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-2-g556277e
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 556277eb100c2fa061677a59be33eb71876a2a72 (commit) via 15de26c7f307fe33c4284e7573154cb47bb19ec4 (commit) from a4231943117f5ba3dd0fdc6c8b1824334162b69f (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/FindEnvModules.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 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.15.0-rc1-6-g6ca4973
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 6ca497365af59106976fd3cc0bff8357c6794522 (commit) from 6a78bdbb06e27a5474bf3262d4dcf7459a8627f9 (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=6ca497365af59106976fd3cc0bff8357c6794522 commit 6ca497365af59106976fd3cc0bff8357c6794522 Author: Kitware Robot AuthorDate: Wed Jun 5 00:01:09 2019 -0400 Commit: Kitware Robot CommitDate: Wed Jun 5 00:01:09 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a3679e5..c0b209c 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 15) -set(CMake_VERSION_PATCH 20190604) +set(CMake_VERSION_PATCH 20190605) #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 annotated tag, v3.15.0-rc1, created. v3.15.0-rc1
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 annotated tag, v3.15.0-rc1 has been created at 3dc267d3824e0faacd3d80710d7c93003fbf4267 (tag) tagging a4231943117f5ba3dd0fdc6c8b1824334162b69f (commit) replaces v3.14.5 tagged by Brad King on Tue Jun 4 13:41:01 2019 -0400 - Log - CMake 3.15.0-rc1 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlz2rS0WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhPnFEACwIYCjEycWiCQCs+kZ2TPZJRYn qusBrv4/OQKqv3RC8/+ZoeolnT1jQMJUqLcfVEa81lUeDfXHX41AW8Wcrwko+eQH cFEvlFqcN+sVn+ReG47gK376++9KDhs8NIam9/f4h0ZGsIhRGDFHSztjYVY5izW+ S8kQrCohET9U4txKiFfYVoniJ+3mcZzvbgRgWu5lj8fDQs1ahyGDt1wuiNMW8Zvb xqi6HluuuIigTy7t6y2EV94K+c2vuoaqnAk0yxzyXqCSnQJDgvifrek70F8hMJiI BOMKHxemTvGygkMsTmN511fRae/m5Dbeg38lqMpNar0KNvB4MZKJela3xm7DisAz RZECLqej6SgtVqOjN5DNE0hFhc0Isau4ft5YNNk4oPO1Hb6Z3s0Q4IbmkNdwOEpR koskvhpdORKXulndYxz5lUGo1x88cVY1xdp3LVDsnzNezrmF40AFSgNLgiIlSaba bTOtdab3ebFFmbRQO8zdcLpHDVQemzHKjai7qRRZ9pvi7y9kkxNyMSNpe15Xoe3j RZRc1QlILVi3/BfxB4Y5sGc2bXXxcK01qdwDfZkt+Hesg75fVRJYvDEp0IikviWr 7GD+0a6wIg9YdaR4X2QxPPoJfcjDa25YglDdb0A9IGJiNytgoDBDChJF7hA27JUa ywcccUWSE0jO4PkuaQ== =vzsl -END PGP SIGNATURE- Albert Astals Cid (2): Remove return from void function Delete some default constructors and assignment operators Alex Turbov (6): list: add sub-commands PREPEND, POP_BACK, POP_FRONT cmake: Fix missed `return` statement when CLI errors found string: introduce `REPEAT` sub-command cmSystemTools: Remove unused message-related code, simplify logic message(): Add support for log levels message(): Minor code modernization Alexander Neumann (1): FindZLIB: Add more zlib library names Alexandru Croitor (6): Autogen: Fallback on internal qrc parser when RCC isn't built yet Autogen: Fix deadlock when uv_spawn() fails while trying to run moc iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined Andrei Lebedev (1): FindPostgreSQL: Find debug lib, imported configs Artur Ryt (12): Prefer front/back/data over dereferencing begin/rbegin iter cmAlgorithms: Make cmRange advance/retreat safe for rvalues Modernize: Use ranged for-loops when possible cmCursesMainForm: Modernize with STL and ranged-for loops cmCursesMainForm: Fix lambda return type deducing warning Modernize: C-arrays and loops over them cmFileCommand: Refactor HandleCMakePathCommand cmAlgorithms: Refactor cmRemoveDuplicates cmcmd: Pass args vector by const& cmcmd: Modernize for loops with cmMakeRange Modernize: Prefer .substr in place of .c_str() + int Modernize: Enable modernize-raw-string-literal in clang-tidy Avraham Shukron (1): INTERFACE Target: allow (PUBLIC/PRIVATE)_HEADER properties Axel Huebl (1): FindPNG: Fix definitions on imported target Bartosz Kosiorek (28): cmGlobalGenerator: Remove unused code cmakemain: Remove ignored --use-stderr option from command line help cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand cmake: Teach --build mode to support multiple targets cmake: Reformat '--parallel' and '--verbose' options in help cmake: add short version of '--target ...' option cmake: Upgrade 'cmake -E' commands description ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changes ExternalProject: Simplify generated 'git clone' scripts ExternalProject: Drop unnecessary 'git submodule init' ExternalProject: Extend documentation about GIT_TAG usage cmake: tar: Display warning when no files provided during archive creation Help: Update 'tar' documentation with supported arguments cmake: Don't interrupt archive creation if unable to read a file. ExternalProject: Optimize git commands ExternalProject: Optimize Mercurial commands cmake: tar: Parse 'cmake -E tar' arguments Help: Improve documentation links and formatting Help: Improve Cache documentation Help: Improve documentation formating Help: Improve formatting of Help documentation Modules: Update documentation formatting Help: Improve description of modules cmMakefile: Enforce explicit use of project() command cmake: Teach cmake -E tar command, Zstandard compression cmake: tar: Allow selective extracting and listing of archives cmListFileCache: When missing ending ) print starting line instead of
[Cmake-commits] CMake branch, release, updated. v3.14.5-1259-ga423194
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 a4231943117f5ba3dd0fdc6c8b1824334162b69f (commit) via c0f00079a9d00539b0ca132e8be8fe63b1eed65c (commit) via 0eeb3690d1a65fbc864960e59f3cd43bcdae3a9a (commit) via 0da2c35d6bf0741ce91c682414b56fdca83160d8 (commit) from 9d78ce02933cd913af3da66a23e8ada09db89e3e (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/GetPrerequisites.cmake| 2 +- Tests/RunCMake/CMakeLists.txt | 2 +- Tests/RunCMake/ctest_update/test.cmake.in | 4 +++- 3 files changed, 5 insertions(+), 3 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.14.5-1264-g6a78bdb
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 6a78bdbb06e27a5474bf3262d4dcf7459a8627f9 (commit) via a4231943117f5ba3dd0fdc6c8b1824334162b69f (commit) via ac16778a129fc1076d41490919b63a207591ebf1 (commit) via c0f00079a9d00539b0ca132e8be8fe63b1eed65c (commit) via 0eeb3690d1a65fbc864960e59f3cd43bcdae3a9a (commit) from 0a68c30b81020dde3f149d9b02a598925d746d31 (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=6a78bdbb06e27a5474bf3262d4dcf7459a8627f9 commit 6a78bdbb06e27a5474bf3262d4dcf7459a8627f9 Merge: ac16778 a423194 Author: Brad King AuthorDate: Tue Jun 4 12:29:55 2019 -0400 Commit: Brad King CommitDate: Tue Jun 4 12:29:55 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac16778a129fc1076d41490919b63a207591ebf1 commit ac16778a129fc1076d41490919b63a207591ebf1 Merge: 0a68c30 c0f0007 Author: Brad King AuthorDate: Tue Jun 4 16:28:07 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 12:28:14 2019 -0400 Merge topic 'ctest_xml_tweaks' c0f00079a9 Tests: Fix RunCMake.ctest_update test to not require GIT_EXECUTABLE Acked-by: Kitware Robot Merge-request: !3423 --- Summary of changes: Tests/RunCMake/CMakeLists.txt | 2 +- Tests/RunCMake/ctest_update/test.cmake.in | 4 +++- 2 files changed, 4 insertions(+), 2 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.14.5-1259-g0a68c30
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 0a68c30b81020dde3f149d9b02a598925d746d31 (commit)
via 0da2c35d6bf0741ce91c682414b56fdca83160d8 (commit)
from 98004612f6b5c613d49dde85549d0d556e91a60d (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=0a68c30b81020dde3f149d9b02a598925d746d31
commit 0a68c30b81020dde3f149d9b02a598925d746d31
Merge: 9800461 0da2c35
Author: Brad King
AuthorDate: Tue Jun 4 16:09:33 2019 +
Commit: Kitware Robot
CommitDate: Tue Jun 4 12:09:41 2019 -0400
Merge topic 'GetPrerequisites-variable-typo'
0da2c35d6b GetPrerequisites: fix regression in gp_append_unique
Acked-by: Kitware Robot
Merge-request: !3421
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0da2c35d6bf0741ce91c682414b56fdca83160d8
commit 0da2c35d6bf0741ce91c682414b56fdca83160d8
Author: Ben Boeckel
AuthorDate: Tue Jun 4 11:55:56 2019 -0400
Commit: Brad King
CommitDate: Tue Jun 4 12:00:06 2019 -0400
GetPrerequisites: fix regression in gp_append_unique
The `item` variable was the loop variable in the old code prior to
commit 3dfc8b9bd6 (GetPrerequisites: use if(IN_LIST) instead of foreach,
2019-05-09). The function argument `value` should be used instead.
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 06655a4..5be4676 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -173,7 +173,7 @@ cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW) # if IN_LIST
function(gp_append_unique list_var value)
- if(NOT item IN_LIST ${list_var})
+ if(NOT value IN_LIST ${list_var})
set(${list_var} ${${list_var}} "${value}" PARENT_SCOPE)
endif()
endfunction()
---
Summary of changes:
Modules/GetPrerequisites.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.14.5-1257-g9800461
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 98004612f6b5c613d49dde85549d0d556e91a60d (commit) via 4ec377f5c2f1cc287a433f009a6d0e3e753fe837 (commit) via 9d78ce02933cd913af3da66a23e8ada09db89e3e (commit) via 118bd8b53ea672375bc9d177ef518f42a93c8e5b (commit) from dae9b3e16fdacda16ea28f47dd42d3243ba42be5 (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=98004612f6b5c613d49dde85549d0d556e91a60d commit 98004612f6b5c613d49dde85549d0d556e91a60d Author: Brad King AuthorDate: Tue Jun 4 10:56:45 2019 -0400 Commit: Brad King CommitDate: Tue Jun 4 10:56:45 2019 -0400 Begin post-3.15 development diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst new file mode 100644 index 000..e4cc01e --- /dev/null +++ b/Help/release/dev/0-sample-topic.rst @@ -0,0 +1,7 @@ +0-sample-topic +-- + +* This is a sample release note for the change in a topic. + Developers should add similar notes for each topic branch + making a noteworthy change. Each document should be named + and titled to match the topic name to avoid merge conflicts. diff --git a/Help/release/index.rst b/Help/release/index.rst index 35a47aa..62032e6 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,6 +7,8 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. +.. include:: dev.txt + Releases diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e22d37c..a3679e5 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 15) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 20190604) +#set(CMake_VERSION_RC 1) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ec377f5c2f1cc287a433f009a6d0e3e753fe837 commit 4ec377f5c2f1cc287a433f009a6d0e3e753fe837 Merge: dae9b3e 9d78ce0 Author: Brad King AuthorDate: Tue Jun 4 10:55:43 2019 -0400 Commit: Brad King CommitDate: Tue Jun 4 10:55:43 2019 -0400 Merge branch 'release-3.15' --- 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.14.5-1253-gdae9b3e
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 dae9b3e16fdacda16ea28f47dd42d3243ba42be5 (commit) via 4272297b6ea84eec87d596f970b5ba4f9516f424 (commit) via 01d5730411561b7278d0350dffb8b7dd89ac8970 (commit) via e075e64fd80c3b63492232c7f9019ce65d1d8e4a (commit) from 4d80bd5cd5d7889fcd5d3b02519979034aec82e3 (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=dae9b3e16fdacda16ea28f47dd42d3243ba42be5 commit dae9b3e16fdacda16ea28f47dd42d3243ba42be5 Merge: 4d80bd5 4272297 Author: Brad King AuthorDate: Tue Jun 4 14:51:45 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 10:51:52 2019 -0400 Merge topic 'doc-3.15-relnotes' 4272297b6e Help: Organize and revise 3.15 release notes 01d5730411 Help: Consolidate 3.15 release notes e075e64fd8 Help: Document Swift_DEPENDENCIES_FILE property defaults Acked-by: Kitware Robot Merge-request: !3420 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4272297b6ea84eec87d596f970b5ba4f9516f424 commit 4272297b6ea84eec87d596f970b5ba4f9516f424 Author: Brad King AuthorDate: Tue Jun 4 09:55:17 2019 -0400 Commit: Brad King CommitDate: Tue Jun 4 10:37:29 2019 -0400 Help: Organize and revise 3.15 release notes Add section headers similar to the 3.14 release notes and move each individual bullet into an appropriate section. Revise a few bullets. diff --git a/Help/release/3.15.rst b/Help/release/3.15.rst index 5366ec7..2cff419 100644 --- a/Help/release/3.15.rst +++ b/Help/release/3.15.rst @@ -7,125 +7,190 @@ CMake 3.15 Release Notes Changes made since CMake 3.14 include the following. -* The :command:`execute_process` command gained a `COMMAND_ECHO` option - and supporting :variable:`CMAKE_EXECUTE_PROCESS_COMMAND_ECHO` variable - to enable echoing of the command-line string before execution. +New Features + -* New target property :prop_tgt:`ADDITIONAL_CLEAN_FILES` and directory property - :prop_dir:`ADDITIONAL_CLEAN_FILES` were added. They allow to register - additional files that should be removed during the clean stage. +Generators +-- -* Directory property :prop_dir:`ADDITIONAL_MAKE_CLEAN_FILES` was marked - deprecated. The new directory property :prop_dir:`ADDITIONAL_CLEAN_FILES` - should be used instead. +* The :generator:`Xcode` generator now supports per-target schemes. + See the :variable:`CMAKE_XCODE_GENERATE_SCHEME` variable and + :prop_tgt:`XCODE_GENERATE_SCHEME` target property. -* IBM Clang-based XL compilers that define ``__ibmxl__`` now use the - compiler id ``XLClang`` instead of ``XL``. See policy :policy:`CMP0089`. +* The :generator:`Green Hills MULTI` generator has been updated: -* :command:`add_library` command ``ALIAS`` option learned to support - import libraries of the ``UNKNOWN`` type. + * It now supports the :command:`add_custom_command` and +:command:`add_custom_target` commands. + + * It is now available on Linux. + +Languages +- + +* Preliminary support for the ``Swift`` language was added to the + :generator:`Ninja` generator: + + * Use the :envvar:`SWIFTC` environment variable to specify a compiler. + + * The :prop_tgt:`Swift_DEPENDENCIES_FILE` target property and +:prop_sf:`Swift_DEPENDENCIES_FILE` source file property were added +to customize dependency files. -* AppleClang compiler have learned how to compile C++20. + * The :prop_tgt:`Swift_MODULE_NAME` target property was added to +customize the Swift module name. -* Support for the Clang-based ARM compiler was added with compiler id ``ARMClang``. + * The :prop_sf:`Swift_DIAGNOSTICS_FILE` source property was added to +indicate where to write the serialised Swift diagnostics. + + The Swift support is experimental, not considered stable, and may change + in future releases of CMake. + +Compilers +- * The ``Clang`` compiler variant on Windows that targets the MSVC ABI but has a GNU-like command line is now supported. -* The variable :variable:`CMAKE_AUTOMOC_RELAXED_MODE` is considered - deprecated. Support still exists but will be removed in future versions. - -* The :manual:`cmake(1)` ``--build`` tool ``--target`` parameter gained support for - multiple targets, e.g. ``cmake --build . --target Library1 Library2``. +* Support for the Clang-based ARM compiler was added with compiler id + ``ARMClang``. -* The :manual:`cmake(1)` ``-E tar`` tool now continues adding files to an - archive, even if some of the files aren't readable. This behavior is more - consistent with the classic ``tar`` tool.
[Cmake-commits] CMake branch, master, updated. v3.14.5-1232-g4b68baa
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 4b68baa776bf8ccc2911057fc79b558515438900 (commit) via d4108f5585ae4e0ab79c9b192f9d6a0614f868cd (commit) via 99b9b01c020a0b20c0eefa73a39138471c01a053 (commit) via e591e22d4c7d2b4d4806cf47923e54269644b2a2 (commit) via 7561fcda0918abf71b7fb0cfe67dd70fafe577ae (commit) via f263650f95bdf87e2c50ada4a28d4fb729ac6f1c (commit) via fada8cbfd6ae13d15b015f667a85096b15dc07b1 (commit) via 162555d7ecd510a84fb26a2ebc90f0a3e9eabc1a (commit) via 808b8180632aef06e7a3644fb4d3957722abc3f3 (commit) via 9fd602bfd33479b1acecd40e5c1b76ce37d59798 (commit) via ec66af2026e085e7b648b222794f0f213183ea1e (commit) via 2d4787fc4ddc077e1d8fcb807768d1ecc7902a73 (commit) via 3475e2728bad16899b50131785a61f43083e8ba9 (commit) via 619416f8a30c99f87869559cf3829ce6d3431dca (commit) from 99496f57769a45fb664f6865bd6935d37fe45467 (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=4b68baa776bf8ccc2911057fc79b558515438900 commit 4b68baa776bf8ccc2911057fc79b558515438900 Merge: d4108f5 162555d Author: Brad King AuthorDate: Tue Jun 4 12:32:11 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 08:32:19 2019 -0400 Merge topic 'compiler_id_gen_exp_supports_multiple_ids' 162555d7ec Help: Add release notes for updated generator expressions 808b818063 Genex: CompileLang and CompileLangAndId now match against a list of ids 9fd602bfd3 Genex: PlatformId now can match against a list of ids. ec66af2026 Genex: CompilerId now can match against a list of ids. 2d4787fc4d Genex: Add more extensive support for an unbounded number of parameters Acked-by: Kitware Robot Merge-request: !3405 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4108f5585ae4e0ab79c9b192f9d6a0614f868cd commit d4108f5585ae4e0ab79c9b192f9d6a0614f868cd Merge: 99b9b01 fada8cb Author: Brad King AuthorDate: Tue Jun 4 12:30:18 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 08:30:26 2019 -0400 Merge topic 'check_language_respects_cuda_host_compiler' fada8cbfd6 CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation Acked-by: Kitware Robot Merge-request: !3407 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99b9b01c020a0b20c0eefa73a39138471c01a053 commit 99b9b01c020a0b20c0eefa73a39138471c01a053 Merge: e591e22 3475e27 Author: Brad King AuthorDate: Tue Jun 4 12:27:58 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 08:28:09 2019 -0400 Merge topic 'print-correct-line-number' 3475e2728b cmListFileCache: When missing ending ) print starting line instead of last one Acked-by: Kitware Robot Merge-request: !3398 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e591e22d4c7d2b4d4806cf47923e54269644b2a2 commit e591e22d4c7d2b4d4806cf47923e54269644b2a2 Merge: 7561fcd 619416f Author: Brad King AuthorDate: Tue Jun 4 12:25:38 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 08:25:47 2019 -0400 Merge topic 'better_error_message_for_visibility_preset_property' 619416f8a3 The error message for VISIBILITY_PRESET now documents valid options. Acked-by: Kitware Robot Merge-request: !3409 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7561fcda0918abf71b7fb0cfe67dd70fafe577ae commit 7561fcda0918abf71b7fb0cfe67dd70fafe577ae Merge: 99496f5 f263650 Author: Brad King AuthorDate: Tue Jun 4 12:24:18 2019 + Commit: Kitware Robot CommitDate: Tue Jun 4 08:24:29 2019 -0400 Merge topic 'test-explicit-dirs' f263650f95 Tests: Fix RunCMake.CommandLine test to use generator in no-S-B case Acked-by: Kitware Robot Merge-request: !3414 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f263650f95bdf87e2c50ada4a28d4fb729ac6f1c commit f263650f95bdf87e2c50ada4a28d4fb729ac6f1c Author: Brad King AuthorDate: Mon Jun 3 14:57:19 2019 -0400 Commit: Brad King CommitDate: Mon Jun 3 14:57:19 2019 -0400 Tests: Fix RunCMake.CommandLine test to use generator in no-S-B case Apply the fix from commit baed22c4b0 (Tests: Fix RunCMake.CommandLine test to use generator with -S and -B, 2019-04-10) to the `no-S-B` case too. It also generates a build system and should use the generator being tested. diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index cee996c..7798b62 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++
[Cmake-commits] CMake branch, master, updated. v3.14.5-1218-g99496f5
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 99496f57769a45fb664f6865bd6935d37fe45467 (commit) from 73472408c501e66c9dd8c027293b8c0907001b42 (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=99496f57769a45fb664f6865bd6935d37fe45467 commit 99496f57769a45fb664f6865bd6935d37fe45467 Author: Kitware Robot AuthorDate: Tue Jun 4 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Tue Jun 4 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 29543b8..aeccf8e 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 14) -set(CMake_VERSION_PATCH 20190603) +set(CMake_VERSION_PATCH 20190604) #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.14.5-1217-g7347240
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 73472408c501e66c9dd8c027293b8c0907001b42 (commit)
via 7d9e66a405ccd44fe3271278449ce0887a462d41 (commit)
via ccf950795666406e59f420fd2732149711cb0362 (commit)
via df06c8d7921d09a2a627731866a8ce895990067b (commit)
via 409922f695df4fc885d04338f56dcfb4dc406f7d (commit)
via 7fd3811400b9b2483d635dbcc1b0bfab268527df (commit)
via 834ec4ebfe982ff75b2a34bac2515d221bc3ab38 (commit)
via 465d6d7f9b53aeaab4b388f30adc324fae8ab4c8 (commit)
via 4c9e99e1f9c09e947890e2fe3372ba463904f381 (commit)
via cba85845172e8e12652e871d6109dba3127e8363 (commit)
via c79b666c432fe5e0f3532d3ea508218f58bbc9a6 (commit)
via 477f9e309563ec642c7323337e0aaf79a1256dac (commit)
via fc451f130ded493ae13fda1950d31acc39002ffc (commit)
via 2dc483476c134ec6fb05802990a98df406a39caf (commit)
via 5823510745224f0e9ba6d69313c139bcfd9a3953 (commit)
via fe018819cb4b944cafbd6d8b9e9f6332014579a9 (commit)
via c367f7d5469e21739629a896aea3a04bb476c2bf (commit)
via 1e7e47f597754e800673b158ce1bd59c8b6c566a (commit)
via e97ea5201037b67012ecabb1cb7aebabebfed20d (commit)
via 43af4ca78e80c65d3c0cf2c5121d61988e9d5192 (commit)
via e762da6dc98474a71d0e69866ec3800af3117466 (commit)
via 0d0cb136fb19d96f857f8d7da918e18038d5b627 (commit)
via 09c21914b320567583ce5ff4c92e56b8a54bf3cb (commit)
via dff42d481230599ba7962a5895d75e7c0d16939e (commit)
via df72f06182f3481fe8929c49578052748d980712 (commit)
via 0eed548d3f0387a3bcbdc42ad4456987a37b2934 (commit)
via b6dc977ff17b451b43d8a67584400c3b53c7eb8f (commit)
via 846b4b1062cc83b420ad1405fd74186c33bb1513 (commit)
via 8a46a07c8bd2fddde5e4db797279e21a5575e213 (commit)
via 15c644437ae355ac196cfcfe1e874d8280451b43 (commit)
via 1b16d7656733a89d1d9735cf31654824b76aab9b (commit)
from 5e2d22c177add56b2538ab10954dfb049c5cf945 (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=73472408c501e66c9dd8c027293b8c0907001b42
commit 73472408c501e66c9dd8c027293b8c0907001b42
Merge: 5e2d22c 7d9e66a
Author: Brad King
AuthorDate: Mon Jun 3 15:51:09 2019 +
Commit: Kitware Robot
CommitDate: Mon Jun 3 11:51:23 2019 -0400
Merge topic 'ninja_build_class'
7d9e66a405 Ninja: Remove non cmNinjaBuild based WriteBuild method
ccf9507956 Ninja: Use cmNinjaBuild class for WriteBuild
df06c8d792 Ninja: Use cmNinjaBuild class for WriteBuild
409922f695 Ninja: Use cmNinjaBuild class for WriteBuild
7fd3811400 Ninja: Use cmNinjaBuild class for WriteBuild
834ec4ebfe Ninja: Use cmNinjaBuild class for WriteBuild
465d6d7f9b Ninja: Use cmNinjaBuild class for WriteBuild
4c9e99e1f9 Ninja: Use cmNinjaBuild class for WriteBuild
...
Acked-by: Kitware Robot
Merge-request: !3403
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d9e66a405ccd44fe3271278449ce0887a462d41
commit 7d9e66a405ccd44fe3271278449ce0887a462d41
Author: Sebastian Holtermann
AuthorDate: Thu May 30 17:39:22 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Thu May 30 18:38:21 2019 +0200
Ninja: Remove non cmNinjaBuild based WriteBuild method
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index db0e01c..2d52356 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -127,113 +127,107 @@ std::string cmGlobalNinjaGenerator::EncodePath(const
std::string& path)
return result;
}
-void cmGlobalNinjaGenerator::WriteBuild(
- std::ostream& os, const std::string& comment, const std::string& rule,
- const cmNinjaDeps& outputs, const cmNinjaDeps& implicitOuts,
- const cmNinjaDeps& explicitDeps, const cmNinjaDeps& implicitDeps,
- const cmNinjaDeps& orderOnlyDeps, const cmNinjaVars& variables,
- const std::string& rspfile, int cmdLineLimit, bool* usedResponseFile)
+void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
+cmNinjaBuild const& build,
+int cmdLineLimit,
+bool* usedResponseFile)
{
// Make sure there is a rule.
- if (rule.empty()) {
+ if (build.Rule.empty()) {
cmSystemTools::Error("No rule for WriteBuild! called with comment: " +
- comment);
+ build.Comment);
return;
}
// Make sure there is at least one output file.
- if (outputs.empty()) {
+ if (build.Outputs.empty()) {
[Cmake-commits] CMake branch, master, updated. v3.14.5-1186-g5e2d22c
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 5e2d22c177add56b2538ab10954dfb049c5cf945 (commit)
via 52b298bd031d97df7cdb36e6386ebbfab10946b7 (commit)
from 3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 (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=5e2d22c177add56b2538ab10954dfb049c5cf945
commit 5e2d22c177add56b2538ab10954dfb049c5cf945
Merge: 3cb5a8d9 52b298b
Author: Brad King
AuthorDate: Mon Jun 3 13:22:25 2019 +
Commit: Kitware Robot
CommitDate: Mon Jun 3 09:22:33 2019 -0400
Merge topic 'FindPython-Python_ROOT_DIR-searched-first'
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first
Acked-by: Kitware Robot
Merge-request: !3408
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52b298bd031d97df7cdb36e6386ebbfab10946b7
commit 52b298bd031d97df7cdb36e6386ebbfab10946b7
Author: Marc Chevrier
AuthorDate: Fri May 31 19:05:04 2019 +0200
Commit: Marc Chevrier
CommitDate: Fri May 31 19:05:04 2019 +0200
FindPython: ensure Python_ROOT_DIR is always searched first
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 5d39240..49d8e26 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1228,6 +1228,7 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
NAMES_PER_DIR
+ HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
NO_CMAKE_PATH
@@ -1338,6 +1339,7 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
NAMES_PER_DIR
+HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
NO_CMAKE_PATH
---
Summary of changes:
Modules/FindPython/Support.cmake | 2 ++
1 file changed, 2 insertions(+)
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.14.5-1184-g3cb5a8d9
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 3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 (commit) via 18d6bdb42d6fceb2b753430e74a4d6076e321f03 (commit) via 774102aaec1a74ea069be9b10a2c846cdbfa609f (commit) via 4127f82179acb13746c6249dd420ffa8b4abeb72 (commit) from 7dae93b4053812d344a80918a8c1c05600800c21 (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=3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 commit 3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 Merge: 18d6bdb 774102a Author: Craig Scott AuthorDate: Mon Jun 3 12:20:13 2019 + Commit: Kitware Robot CommitDate: Mon Jun 3 08:20:22 2019 -0400 Merge topic 'doc-test-cost-default' 774102aaec Help: Clarify the default value for test property COST Acked-by: Kitware Robot Merge-request: !3397 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d6bdb42d6fceb2b753430e74a4d6076e321f03 commit 18d6bdb42d6fceb2b753430e74a4d6076e321f03 Merge: 7dae93b 4127f82 Author: Craig Scott AuthorDate: Mon Jun 3 12:17:42 2019 + Commit: Kitware Robot CommitDate: Mon Jun 3 08:18:02 2019 -0400 Merge topic 'add_library_unknown' 4127f82179 add_library: Document UNKNOWN type of imported targets Acked-by: Kitware Robot Merge-request: !3346 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=774102aaec1a74ea069be9b10a2c846cdbfa609f commit 774102aaec1a74ea069be9b10a2c846cdbfa609f Author: Craig Scott AuthorDate: Wed May 29 20:57:52 2019 -0400 Commit: Craig Scott CommitDate: Sun Jun 2 21:08:56 2019 +1000 Help: Clarify the default value for test property COST Co-Authored-By: Steve Mokris diff --git a/Help/prop_test/COST.rst b/Help/prop_test/COST.rst index 0c0fca7..9300d7b 100644 --- a/Help/prop_test/COST.rst +++ b/Help/prop_test/COST.rst @@ -1,8 +1,14 @@ COST -Set this to a floating point value. Tests in a test set will be run -in descending order of cost. +This property describes the cost of a test. When parallel testing is +enabled, tests in the test set will be run in descending order of cost. +Projects can explicitly define the cost of a test by setting this property +to a floating point value. -This property describes the cost of a test. You can explicitly set -this value; tests with higher ``COST`` values will run first. +When the cost of a test is not defined by the project, +:manual:`ctest ` will initially use a default cost of ``0``. +It computes a weighted average of the cost each time a test is run and +uses that as an improved estimate of the cost for the next run. The more +a test is re-run in the same build directory, the more representative the +cost should become. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4127f82179acb13746c6249dd420ffa8b4abeb72 commit 4127f82179acb13746c6249dd420ffa8b4abeb72 Author: Cristian Adam AuthorDate: Mon May 20 22:40:17 2019 +0200 Commit: Cristian Adam CommitDate: Sun Jun 2 08:44:47 2019 +0200 add_library: Document UNKNOWN type of imported targets diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index b42fe42..7274e44 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -94,6 +94,12 @@ The most important properties are: See documentation of the ``IMPORTED_*`` and ``INTERFACE_*`` properties for more information. +An ``UNKNOWN`` library type is typically only used in the implementation of +:ref:`Find Modules`. It allows the path to an imported library (often found +using the :command:`find_library` command) to be used without having to know +what type of library it is. This is especially useful on Windows where a +static library and a DLL's import library both have the same file extension. + Object Libraries --- Summary of changes: Help/command/add_library.rst | 6 ++ Help/prop_test/COST.rst | 14 ++ 2 files changed, 16 insertions(+), 4 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.14.5-1180-g7dae93b
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 7dae93b4053812d344a80918a8c1c05600800c21 (commit) from 51e7488c03f29ae6247d5012fed7dc3fa7924ce0 (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=7dae93b4053812d344a80918a8c1c05600800c21 commit 7dae93b4053812d344a80918a8c1c05600800c21 Author: Kitware Robot AuthorDate: Mon Jun 3 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Mon Jun 3 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a1a4c22..29543b8 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 14) -set(CMake_VERSION_PATCH 20190602) +set(CMake_VERSION_PATCH 20190603) #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.14.5-1179-g51e7488
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 51e7488c03f29ae6247d5012fed7dc3fa7924ce0 (commit) from 7f4a1d83790cad143dc8400cc78186dbef88e23d (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=51e7488c03f29ae6247d5012fed7dc3fa7924ce0 commit 51e7488c03f29ae6247d5012fed7dc3fa7924ce0 Author: Kitware Robot AuthorDate: Sun Jun 2 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun Jun 2 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6ef..a1a4c22 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 14) -set(CMake_VERSION_PATCH 20190601) +set(CMake_VERSION_PATCH 20190602) #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.14.5-1178-g7f4a1d8
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 7f4a1d83790cad143dc8400cc78186dbef88e23d (commit) from 187928875d215df8757b291ad629a36df75da42b (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=7f4a1d83790cad143dc8400cc78186dbef88e23d commit 7f4a1d83790cad143dc8400cc78186dbef88e23d Author: Kitware Robot AuthorDate: Sat Jun 1 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Sat Jun 1 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a3d46bc..6ef 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 14) -set(CMake_VERSION_PATCH 20190531) +set(CMake_VERSION_PATCH 20190601) #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.14.5-1177-g1879288
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 187928875d215df8757b291ad629a36df75da42b (commit)
via 42e14d90b1b38df6c698ef230ab06ae9504436d5 (commit)
from 66bba23a4b4c6e7901524677f245d02a31b3eff8 (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=187928875d215df8757b291ad629a36df75da42b
commit 187928875d215df8757b291ad629a36df75da42b
Merge: 66bba23 42e14d9
Author: Brad King
AuthorDate: Fri May 31 17:18:21 2019 +
Commit: Kitware Robot
CommitDate: Fri May 31 13:18:31 2019 -0400
Merge topic 'vs-add-package-reference'
42e14d90b1 VS: Added support for VS package references for nuget
Acked-by: Kitware Robot
Acked-by: Leonid Pospelov
Merge-request: !3389
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42e14d90b1b38df6c698ef230ab06ae9504436d5
commit 42e14d90b1b38df6c698ef230ab06ae9504436d5
Author: Kinan Mahdi
AuthorDate: Tue May 28 16:21:14 2019 +0200
Commit: Brad King
CommitDate: Thu May 30 10:22:44 2019 -0400
VS: Added support for VS package references for nuget
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 9d2ad90..25aab8d 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -342,6 +342,7 @@ Properties on Targets
/prop_tgt/VS_KEYWORD
/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION
/prop_tgt/VS_NO_SOLUTION_DEPLOY
+ /prop_tgt/VS_PACKAGE_REFERENCES
/prop_tgt/VS_PROJECT_IMPORT
/prop_tgt/VS_SCC_AUXPATH
/prop_tgt/VS_SCC_LOCALPATH
diff --git a/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst
b/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst
new file mode 100644
index 000..5a0465b
--- /dev/null
+++ b/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst
@@ -0,0 +1,13 @@
+VS_PACKAGE_REFERENCES
+-
+
+Visual Studio package references for nuget.
+
+Adds one or more semicolon-delimited package references to a generated
+Visual Studio project. The version of the package will be
+underscore delimited. For example, ``boost_1.7.0;nunit_3.12.*``.
+
+.. code-block:: cmake
+
+ set_property(TARGET ${TARGET_NAME} PROPERTY
+VS_PACKAGE_REFERENCES "boost_1.7.0")
diff --git a/Help/release/dev/vs-add-package-references.rst
b/Help/release/dev/vs-add-package-references.rst
new file mode 100644
index 000..2d260dc
--- /dev/null
+++ b/Help/release/dev/vs-add-package-references.rst
@@ -0,0 +1,6 @@
+vs-add-package-references
+-
+
+* A :prop_tgt:`VS_PACKAGE_REFERENCES` target property was added to
+ tell :ref:`Visual Studio Generators` to add references to nuget
+ packages.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index d328a8c..09821e9 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -664,6 +664,7 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteCustomCommands(e0);
this->WriteAllSources(e0);
this->WriteDotNetReferences(e0);
+this->WritePackageReferences(e0);
this->WriteImports(e0);
this->WriteEmbeddedResourceGroup(e0);
this->WriteXamlFilesGroup(e0);
@@ -737,6 +738,33 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteGroups();
}
+void cmVisualStudio10TargetGenerator::WritePackageReferences(Elem& e0)
+{
+ std::vector packageReferences;
+ if (const char* vsPackageReferences =
+this->GeneratorTarget->GetProperty("VS_PACKAGE_REFERENCES")) {
+cmSystemTools::ExpandListArgument(vsPackageReferences, packageReferences);
+ }
+ if (!packageReferences.empty()) {
+Elem e1(e0, "ItemGroup");
+for (std::string const& ri : packageReferences) {
+ size_t versionIndex = ri.find_last_of('_');
+ if (versionIndex != std::string::npos) {
+WritePackageReference(e1, ri.substr(0, versionIndex),
+ ri.substr(versionIndex + 1));
+ }
+}
+ }
+}
+
+void cmVisualStudio10TargetGenerator::WritePackageReference(
+ Elem& e1, std::string const& ref, std::string const& version)
+{
+ Elem e2(e1, "PackageReference");
+ e2.Attribute("Include", ref);
+ e2.Attribute("Version", version);
+}
+
void cmVisualStudio10TargetGenerator::WriteDotNetReferences(Elem& e0)
{
std::vector references;
diff --git a/Source/cmVisualStudio10TargetGenerator.h
b/Source/cmVisualStudio10TargetGenerator.h
index 1dea8e9..cb6832b 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -72,6 +72,9 @@ private:
void WriteExcludeFromBuild(Elem& e2,
[Cmake-commits] CMake annotated tag, v3.14.5, created. v3.14.5
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 annotated tag, v3.14.5 has been created at 9cd999cf8e8169b9a83aa7807ac866881a1419e9 (tag) tagging f3e9a6ff62f6f58cd661dd447c22a01c50f6f4ad (commit) replaces v3.14.4 tagged by Brad King on Fri May 31 10:25:58 2019 -0400 - Log - CMake 3.14.5 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlzxOXYWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhKAhD/9ABOsabFP2H9jd9eyT/OKKa25/ THZSbgbP4dwx6JJiH5XsQUMvMjBGdeElTHOrjacvI3Tqa4w2gO1MQIxwFQo49X2R 3zvM0N5NiIcJysgmdjI+PmOp9rTH7oAfBkfcY4eDUD1NG09+8qjlhk0O1OlbkqKQ yk8pT/MvxzZloZZnQ2lm5I22a5qYQ6vDBhOl9CoHGiuL+XOP47kK9t5YjQ7dJyT6 Z+tnmTNnGg8EYyx63d4vEEpDZ7HSUqANN3Htc+XtjTtGR785AK3lMAbL45WpIW2F +4V70t0yNTt90aC2iI0OCTZ0DC1E0ymMJSX8pVFU9AReELuX8IVORmOtw3sKzMF1 +bR1/17/bYZfHAy+NxbKHTpSPG6MHRpo6y6vg2ss1HHwZ5VP/1RUVe1FQPrgR4Ua DQdCN2EJrqS4+udTHsk3e6Mcy0Z0yDSPV53aZja7wAQIY4/7bFXAuRCUDxNvXx+I xsKWgS2xe6PrTwGqeWUpsMJGdBuxZYYiszSLOt/k3ix4dlxBllbDoWIlkK4PoSjU yG37Bib96N2RYl/8Pv4z1dbKT+3m8co4Ic6EcfHu/GNfohrXw1YpVw+Znu3O80wK IGvSQf4U5/c0mSN7nJYMFhS+zsVoHOMYG7TeflofhgcOomOZx9DFG9Q/TkRB3b/+ CDiz7QyIWW7JTSf1tg== =uN6H -END PGP SIGNATURE- Alex Turbov (1): FindBoost: Add compiler features for Boost Contract library Brad King (10): libarchive: avoid b64_encode name conflict with Solaris built-in function Merge branch 'libarchive-solaris-11.4' into release-3.14 Merge branch 'FindBoost-contract-requires-compile-features' into release-3.14 FindThreads: Drop incorrect docs about usage with C++ Merge branch 'FindThreads-doc-c++' into release-3.14 Do not exclude include directories made implicit by CPATH Merge branch 'implicit-includes-CPATH' into release-3.14 VS: Isolate custom command input/output generation scopes Merge branch 'vs-depends-dedup' into release-3.14 CMake 3.14.5 Frans van Dorsselaer (2): VS: Clarify name of custom commands AdditionalInputs variable VS: De-duplicate custom command dependencies --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.14.4-13-gf3e9a6f
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 f3e9a6ff62f6f58cd661dd447c22a01c50f6f4ad (commit) from dd7ba6ff19ae34aa748240fad02ce006e4425cab (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: 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.14.4-1188-g66bba23
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 66bba23a4b4c6e7901524677f245d02a31b3eff8 (commit) via f3e9a6ff62f6f58cd661dd447c22a01c50f6f4ad (commit) from 720253393c42d64118faf92a56949bfa271a0424 (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=66bba23a4b4c6e7901524677f245d02a31b3eff8 commit 66bba23a4b4c6e7901524677f245d02a31b3eff8 Merge: 7202533 f3e9a6f Author: Brad King AuthorDate: Fri May 31 10:39:09 2019 -0400 Commit: Brad King CommitDate: Fri May 31 10:39:09 2019 -0400 Merge branch 'release-3.14' --- Summary of changes: 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.14.4-1186-g7202533
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 720253393c42d64118faf92a56949bfa271a0424 (commit) via ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc (commit) via d8e90be04df9d10a2b635323ccf421f1822ade8c (commit) via 7e1c3b36455df9403b88920586453f0bbabacaca (commit) via 82fec3784b8b89bd98ddf2c7462bfab11e6cbca4 (commit) via 0d025f75c14c0f5a7b7199a0712c958f5703c24e (commit) via dd7ba6ff19ae34aa748240fad02ce006e4425cab (commit) via 42bc67bd43ca67c98dc33f8cb8e2f4ee3884697f (commit) via d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1 (commit) via fcedf8e5528d711f1e4b765809da018d5adb2abd (commit) via fd28e24947af12f661516dc2b942f2f1a8f586c4 (commit) via 3a7f493b7b92eeead6841c393d7bbed62b52cbc9 (commit) via 9ef1e13bcccd46c822ee813017601781bbe9a43d (commit) via 540a175d2059e59fc0c5c8b8d5812c89639b27e3 (commit) via 2d0b0e2b9d50aa14ccf345c727b2da73dfba9bd6 (commit) via 4a871d51a3fa05000ea7a03587cd995783988c36 (commit) from ebee9ff160569481aed4e0db5cbb3f3ac925c044 (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=720253393c42d64118faf92a56949bfa271a0424 commit 720253393c42d64118faf92a56949bfa271a0424 Merge: ec4d70b fd28e24 Author: Brad King AuthorDate: Fri May 31 13:10:43 2019 + Commit: Kitware Robot CommitDate: Fri May 31 09:10:51 2019 -0400 Merge topic 'ninja-cmcldeps' fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC Acked-by: Kitware Robot Merge-request: !3404 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc commit ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc Merge: d8e90be 3a7f493 Author: Brad King AuthorDate: Fri May 31 13:09:03 2019 + Commit: Kitware Robot CommitDate: Fri May 31 09:09:30 2019 -0400 Merge topic 'update-kwsys' 3a7f493b7b Merge branch 'upstream-KWSys' into update-kwsys 9ef1e13bcc KWSys 2019-05-30 (f892bacf) Acked-by: Kitware Robot Merge-request: !3401 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8e90be04df9d10a2b635323ccf421f1822ade8c commit d8e90be04df9d10a2b635323ccf421f1822ade8c Merge: 7e1c3b3 4a871d5 Author: Brad King AuthorDate: Fri May 31 13:08:30 2019 + Commit: Kitware Robot CommitDate: Fri May 31 09:08:40 2019 -0400 Merge topic 'FindPython-remove-erroneous-code' 4a871d51a3 FindPython*: remove erroneous code Acked-by: Kitware Robot Merge-request: !3400 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e1c3b36455df9403b88920586453f0bbabacaca commit 7e1c3b36455df9403b88920586453f0bbabacaca Merge: 82fec37 dd7ba6f Author: Brad King AuthorDate: Fri May 31 09:07:44 2019 -0400 Commit: Brad King CommitDate: Fri May 31 09:07:44 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82fec3784b8b89bd98ddf2c7462bfab11e6cbca4 commit 82fec3784b8b89bd98ddf2c7462bfab11e6cbca4 Merge: 0d025f7 42bc67b Author: Brad King AuthorDate: Fri May 31 13:03:25 2019 + Commit: Kitware Robot CommitDate: Fri May 31 09:04:47 2019 -0400 Merge topic 'vs-depends-dedup' 42bc67bd43 VS: De-duplicate custom command dependencies d03a6fc857 VS: Clarify name of custom commands AdditionalInputs variable fcedf8e552 VS: Isolate custom command input/output generation scopes Acked-by: Kitware Robot Merge-request: !3388 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d025f75c14c0f5a7b7199a0712c958f5703c24e commit 0d025f75c14c0f5a7b7199a0712c958f5703c24e Merge: ebee9ff 2d0b0e2 Author: Brad King AuthorDate: Fri May 31 13:03:16 2019 + Commit: Kitware Robot CommitDate: Fri May 31 09:03:28 2019 -0400 Merge topic 'implicit-includes-CPATH' 2d0b0e2b9d Do not exclude include directories made implicit by CPATH Acked-by: Kitware Robot Merge-request: !3395 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd28e24947af12f661516dc2b942f2f1a8f586c4 commit fd28e24947af12f661516dc2b942f2f1a8f586c4 Author: Marc-André Moreau AuthorDate: Thu May 30 13:03:37 2019 -0400 Commit: Marc-André Moreau CommitDate: Thu May 30 13:11:34 2019 -0400 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 776b209..7a83859 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -421,5 +421,7 @@ macro(__windows_compiler_msvc_enable_rc flags) endif()
[Cmake-commits] CMake branch, release, updated. v3.14.4-12-gdd7ba6f
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 dd7ba6ff19ae34aa748240fad02ce006e4425cab (commit)
via 42bc67bd43ca67c98dc33f8cb8e2f4ee3884697f (commit)
via d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1 (commit)
via fcedf8e5528d711f1e4b765809da018d5adb2abd (commit)
via 540a175d2059e59fc0c5c8b8d5812c89639b27e3 (commit)
via 2d0b0e2b9d50aa14ccf345c727b2da73dfba9bd6 (commit)
from f07d42632bd4f29eda871de12ebb5f03f9d4edda (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:
Help/release/3.14.rst | 8 +++
Source/cmLocalGenerator.cxx| 28 --
Source/cmLocalGenerator.h | 2 +
Source/cmVisualStudio10TargetGenerator.cxx | 62 +++---
Source/cmVisualStudio10TargetGenerator.h | 3 +-
Tests/CMakeLists.txt | 18 +++
Tests/IncludeDirectoriesCPATH/CMakeLists.txt | 22
.../consumer.cpp} | 3 +-
.../viacpath}/systemlib.h | 1 -
9 files changed, 121 insertions(+), 26 deletions(-)
create mode 100644 Tests/IncludeDirectoriesCPATH/CMakeLists.txt
copy Tests/{IncludeDirectories/SystemIncludeDirectories/imported_consumer.cpp
=> IncludeDirectoriesCPATH/consumer.cpp} (76%)
copy Tests/{IncludeDirectories/SystemIncludeDirectories/systemlib_header_only
=> IncludeDirectoriesCPATH/viacpath}/systemlib.h (99%)
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.14.4-1170-gebee9ff
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 ebee9ff160569481aed4e0db5cbb3f3ac925c044 (commit) from c0b560f6641ab406894864c2534740bd1fd538a4 (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=ebee9ff160569481aed4e0db5cbb3f3ac925c044 commit ebee9ff160569481aed4e0db5cbb3f3ac925c044 Author: Kitware Robot AuthorDate: Fri May 31 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 31 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 63f1dce..a3d46bc 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 14) -set(CMake_VERSION_PATCH 20190530) +set(CMake_VERSION_PATCH 20190531) #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.14.4-1169-gc0b560f
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 c0b560f6641ab406894864c2534740bd1fd538a4 (commit)
via b410dd5a05c83b7728a9c4501d5ca5bf7d11822c (commit)
via 06434fc2748f241eb6d89ffd2c0c66fb95dba9cb (commit)
from 7a8a24d0284856b7b38037884d0b17a1de7a9926 (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=c0b560f6641ab406894864c2534740bd1fd538a4
commit c0b560f6641ab406894864c2534740bd1fd538a4
Merge: 7a8a24d b410dd5
Author: Brad King
AuthorDate: Thu May 30 18:13:25 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 14:14:22 2019 -0400
Merge topic 'update-vim-syntax'
b410dd5a05 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
06434fc274 vim-cmake-syntax 2019-05-29 (c42ede9f)
Acked-by: Kitware Robot
Merge-request: !3394
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b410dd5a05c83b7728a9c4501d5ca5bf7d11822c
commit b410dd5a05c83b7728a9c4501d5ca5bf7d11822c
Merge: 067a4f4 06434fc
Author: Patrick Boettcher
AuthorDate: Wed May 29 16:58:06 2019 +0200
Commit: Brad King
CommitDate: Wed May 29 11:57:17 2019 -0400
Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
vim-cmake-syntax 2019-05-29 (c42ede9f)
diff --cc Auxiliary/vim/syntax/cmake.vim
index 877a033,50d503b..cd8385b
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@@ -2219,10 -2975,13 +2975,15 @@@ syn keyword cmakeGeneratorExpressions c
\ C_COMPILER_VERSION
\ C_STANDARD
\ DEBUG_MODE
+ \ DEBUG_POSTFIX
+ \ EXCLUDE
\ EXPORT
+ \ FALSE
+ \ FILTER
\ FOO_EXTRA_THINGS
+\ Fortran_COMPILER_ID
+\ Fortran_COMPILER_VERSION
+ \ GENERATE
\ GENEX_EVAL
\ GNU
\ IF
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06434fc2748f241eb6d89ffd2c0c66fb95dba9cb
commit 06434fc2748f241eb6d89ffd2c0c66fb95dba9cb
Author: vim-cmake-syntax upstream
AuthorDate: Wed May 29 16:48:23 2019 +0200
Commit: Brad King
CommitDate: Wed May 29 11:53:59 2019 -0400
vim-cmake-syntax 2019-05-29 (c42ede9f)
Code extracted from:
https://github.com/pboettch/vim-cmake-syntax.git
at commit c42ede9f70e53a69f98e5bc5df16f834937dd37c (master).
Upstream Shortlog
-
Patrick Boettcher (6):
4e657a05 update to cmake version 3.13.20181220-g0495c
b0ada6e2 add -replacing in variables.
60654a65 Update keywords for version 3.14.20190402-g56ae2
33e512bd format brace-encapsulated variables (varname from var)
a3628ebb fix keywords of generator-expressions wrongly colored in
simple arguments
c42ede9f update to cmake version 3.14.20190529-g067a4f
diff --git a/cmake.vim.in b/cmake.vim.in
index 77ad3d8..3471b54 100644
--- a/cmake.vim.in
+++ b/cmake.vim.in
@@ -31,11 +31,11 @@ syn region cmakeGeneratorExpression start="$<" end=">"
contained oneline contain
syn region cmakeString start='"' end='"' contained
contains=cmakeTodo,cmakeVariableValue,cmakeEscaped
-syn region cmakeVariableValue start="${" end="}" contained oneline
contains=cmakeVariable,cmakeTodo
+syn region cmakeVariableValue start="${" end="}" contained oneline
contains=cmakeVariable,cmakeTodo,cmakeVariableValue
syn region cmakeEnvironment start="$ENV{" end="}" contained oneline
contains=cmakeTodo
-syn region cmakeArguments start="(" end=")"
contains=ALLBUT,cmakeCommand,cmakeCommandConditional,cmakeCommandRepeat,cmakeCommandDeprecated,cmakeCommandManuallyAdded,cmakeArguments,cmakeTodo
+syn region cmakeArguments start="(" end=")"
contains=ALLBUT,cmakeGeneratorExpressions,cmakeCommand,cmakeCommandConditional,cmakeCommandRepeat,cmakeCommandDeprecated,cmakeCommandManuallyAdded,cmakeArguments,cmakeTodo
syn case match
diff --git a/extract-upper-case.pl b/extract-upper-case.pl
index bd62ade..204b496 100755
--- a/extract-upper-case.pl
+++ b/extract-upper-case.pl
@@ -13,6 +13,9 @@ my @properties;
my @modules;
my %keywords; # command => keyword-list
+# find cmake/Modules/ | sed -rn 's/.*CMakeDetermine(.+)Compiler.cmake/\1/p' |
sort
+my @languages = qw(ASM ASM_MASM ASM_NASM C CSharp CUDA CXX Fortran Java RC
Swift);
+
# unwanted upper-cases
my %unwanted = map { $_ => 1 } qw(VS CXX IDE NOTFOUND NO_ DFOO DBAR NEW);
# cannot remove ALL - exists for add_custom_command
@@ -30,8 +33,21 @@ push @modules, "ExternalProject";
# variables
[Cmake-commits] CMake branch, master, updated. v3.14.4-1166-g7a8a24d
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 7a8a24d0284856b7b38037884d0b17a1de7a9926 (commit)
via 35bfc85d95a480f0b0b6f22d764e06672cd8d6ac (commit)
from 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a (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=7a8a24d0284856b7b38037884d0b17a1de7a9926
commit 7a8a24d0284856b7b38037884d0b17a1de7a9926
Merge: 5bb1e9a 35bfc85
Author: Brad King
AuthorDate: Thu May 30 14:41:04 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 10:41:14 2019 -0400
Merge topic 'FindBoost-debug-messages'
35bfc85d95 FindBoost: Refactor debug messages
Acked-by: Kitware Robot
Merge-request: !3382
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35bfc85d95a480f0b0b6f22d764e06672cd8d6ac
commit 35bfc85d95a480f0b0b6f22d764e06672cd8d6ac
Author: Dennis Klein
AuthorDate: Mon May 27 18:05:51 2019 +0200
Commit: Dennis Klein
CommitDate: Tue May 28 20:46:43 2019 +0200
FindBoost: Refactor debug messages
* Deduplicate code with helper functions
* Remove double printing of _boost_TEST_VERSIONS
* Fix #19158
* Add printing of a few additional variables
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 464f229..a059589 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -303,6 +303,56 @@ endif()
# FindBoost functions & macros
#
+#
+# Print debug text if Boost_DEBUG is set.
+# Call example:
+# _Boost_DEBUG_PRINT("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}"
"debug message")
+#
+function(_Boost_DEBUG_PRINT file line text)
+ if(Boost_DEBUG)
+message(STATUS "[ ${file}:${line} ] ${text}")
+ endif()
+endfunction()
+
+#
+# _Boost_DEBUG_PRINT_VAR(file line variable_name [ENVIRONMENT]
+#[SOURCE "short explanation of origin of var value"])
+#
+# ENVIRONMENT - look up environment variable instead of CMake variable
+#
+# Print variable name and its value if Boost_DEBUG is set.
+# Call example:
+# _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}" BOOST_ROOT)
+#
+function(_Boost_DEBUG_PRINT_VAR file line name)
+ if(Boost_DEBUG)
+cmake_parse_arguments(_args "ENVIRONMENT" "SOURCE" "" ${ARGN})
+
+unset(source)
+if(_args_SOURCE)
+ set(source " (${_args_SOURCE})")
+endif()
+
+if(_args_ENVIRONMENT)
+ if(DEFINED ENV{${name}})
+set(value "\"$ENV{${name}}\"")
+ else()
+set(value "")
+ endif()
+ set(_name "ENV{${name}}")
+else()
+ if(DEFINED "${name}")
+set(value "\"${${name}}\"")
+ else()
+set(value "")
+ endif()
+ set(_name "${name}")
+endif()
+
+_Boost_DEBUG_PRINT("${file}" "${line}" "${_name} = ${value}${source}")
+ endif()
+endfunction()
+
#
# Check the existence of the libraries.
@@ -420,11 +470,10 @@ macro(_Boost_FIND_LIBRARY var build_type)
# If Boost_LIBRARY_DIR_[RELEASE,DEBUG] is known then search only there.
if(Boost_LIBRARY_DIR_${build_type})
set(_boost_LIBRARY_SEARCH_DIRS_${build_type}
${Boost_LIBRARY_DIR_${build_type}} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}
] "
-" Boost_LIBRARY_DIR_${build_type} = ${Boost_LIBRARY_DIR_${build_type}}"
-" _boost_LIBRARY_SEARCH_DIRS_${build_type} =
${_boost_LIBRARY_SEARCH_DIRS_${build_type}}")
-endif()
+_Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "Boost_LIBRARY_DIR_${build_type}")
+_Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "_boost_LIBRARY_SEARCH_DIRS_${build_type}")
endif()
endmacro()
@@ -560,9 +609,10 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
set(_boost_COMPILER "-clang${_boost_COMPILER_VERSION}")
endif()
else()
-# TODO at least Boost_DEBUG here?
set(_boost_COMPILER "")
endif()
+ _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "_boost_COMPILER" SOURCE "guessed")
set(${_ret} ${_boost_COMPILER} PARENT_SCOPE)
endfunction()
@@ -1222,21 +1272,12 @@ else()
endif()
endif()
-if(Boost_DEBUG)
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-
