[Cmake-commits] CMake branch, master, updated. v3.14.4-1164-g5bb1e9a
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 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a (commit) via 49f5b6f7bf426d760e6c935f6e8c308d921138a7 (commit) from a6a04cc446e67017e74e294a4aef84e9e8da4323 (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=5bb1e9a382f7ed4d42e799581acaa63a909b7b5a commit 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a Merge: a6a04cc 49f5b6f Author: Brad King AuthorDate: Thu May 30 14:08:54 2019 + Commit: Kitware Robot CommitDate: Thu May 30 10:09:05 2019 -0400 Merge topic 'doc-mr-resolve-states' 49f5b6f7bf Help: Document the expire and external discussion resolve states Acked-by: Kitware Robot Acked-by: Ben Boeckel Acked-by: Brad King Merge-request: !3377 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49f5b6f7bf426d760e6c935f6e8c308d921138a7 commit 49f5b6f7bf426d760e6c935f6e8c308d921138a7 Author: Craig Scott AuthorDate: Sun May 26 21:23:15 2019 +1000 Commit: Craig Scott CommitDate: Thu May 30 19:45:54 2019 +1000 Help: Document the expire and external discussion resolve states Our practice of closing MRs temporarily while discussion takes place in a separate issue isn't always well understood by MR authors. Expiring a MR seems to be better understood, but making it clear that it is also a temporary state is helpful. diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 1d664c4..cbde6fe 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -377,7 +377,15 @@ command is needed to stage it again. Resolve === -A MR may be resolved in one of the following ways. +The workflow used by the CMake project supports a number of different +ways in which a MR can be moved to a resolved state. In addition to +the conventional practices of merging or closing a MR without merging it, +a MR can also be moved to a quasi-resolved state pending some action. +This may involve moving discussion to an issue or it may be the result of +an extended period of inactivity. These quasi-resolved states are used +to help manage the relatively large number of MRs the project receives +and are not an indication of the changes being rejected. The following +sections explain the different resolutions a MR may be given. Merge - @@ -433,15 +441,68 @@ Close - If review has concluded that the MR should not be integrated then it -may be closed through GitLab. +may be closed through GitLab. This would normally be a final state +with no expectation that the MR would be re-opened in the future. +It is also used when a MR is being superseded by another separate one, +in which case a reference to the new MR should be added to the MR being +closed. Expire -- If progress on a MR has stalled for a while, it may be closed with a ``workflow:expired`` label and a comment indicating that the MR has -been closed due to inactivity. - -Contributors are welcome to re-open an expired MR when they are ready -to continue work. Please re-open *before* pushing an update to the -MR topic branch to ensure GitLab will still act on the association. +been closed due to inactivity (it may also be done where the MR is blocked +for an extended period by work in a different MR). This is not an +indication that there is a problem with the MR's content, it is only a +practical measure to allow the reviewers to focus attention on MRs that +are actively being worked on. As a guide, the average period of inactivity +before transitioning a MR to the expired state would be around 2 weeks, +but this may decrease to 1 week or less when there is a high number of +open merge requests. + +Reviewers would usually provide a message similar to the following when +resolving a MR as expired:: + + Closing for now. @ please re-open when ready to continue work. + +This is to make it clear to contributors that they are welcome to re-open +the expired MR when they are ready to return to working on it and moving +it forward. In the meantime, the MR will appear as ``Closed`` in GitLab, +but it can be differentiated from permanently closed MRs by the presence +of the ``workflow:expired`` label. + +**NOTE:** Please re-open *before* pushing an update to the MR topic branch +to ensure GitLab will still act on the association. If changes are pushed +before re-opening the MR, the reviewer should initiate a ``Do: check`` to +force GitLab to act on the updates. + +External Discussion +--- + +In some situations, a series of comments on a MR may develop into a more +involved discussion, or it may become
[Cmake-commits] CMake branch, master, updated. v3.14.4-1162-ga6a04cc
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 a6a04cc446e67017e74e294a4aef84e9e8da4323 (commit)
via 6e8acc51a57e60aff307e4730c8a2314e5cf737a (commit)
via 9dad42d21a67592040d1100882147eed77753392 (commit)
via 4fe34b2d29ca67ea91b2545b223dad8abbcad282 (commit)
via 57cedb18c097a7231223b8a4279534216cad1b93 (commit)
via 6136ab5e179b33ddd659ad458ad8efd773ec8db8 (commit)
via 6a23fbce47294e746c15ee851dc3460a3a17da2b (commit)
from 05af1770a05e00d67f12f4e3ef294360d8d6480d (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=a6a04cc446e67017e74e294a4aef84e9e8da4323
commit a6a04cc446e67017e74e294a4aef84e9e8da4323
Merge: 6e8acc5 4fe34b2
Author: Brad King
AuthorDate: Thu May 30 13:55:22 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:58:37 2019 -0400
Merge topic 'fix-clang-warnings'
4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows
Acked-by: Kitware Robot
Merge-request: !3396
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e8acc51a57e60aff307e4730c8a2314e5cf737a
commit 6e8acc51a57e60aff307e4730c8a2314e5cf737a
Merge: 9dad42d 57cedb1
Author: Brad King
AuthorDate: Thu May 30 13:53:04 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:57:11 2019 -0400
Merge topic 'string-tar'
57cedb18c0 cmSystemTools: std::string parameters for tar functions
Acked-by: Kitware Robot
Merge-request: !3392
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dad42d21a67592040d1100882147eed77753392
commit 9dad42d21a67592040d1100882147eed77753392
Merge: 05af177 6136ab5
Author: Brad King
AuthorDate: Thu May 30 13:52:50 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:53:09 2019 -0400
Merge topic 'ninja_rule_class'
6136ab5e17 Ninja: Use cmNinjaRule as sole parameter in the WriteRule and
AddRule methods
6a23fbce47 Ninja: Add cmNinjaRule class
Acked-by: Kitware Robot
Merge-request: !3393
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fe34b2d29ca67ea91b2545b223dad8abbcad282
commit 4fe34b2d29ca67ea91b2545b223dad8abbcad282
Author: Zsolt Parragi
AuthorDate: Wed May 29 18:03:34 2019 +0200
Commit: Zsolt Parragi
CommitDate: Wed May 29 18:18:09 2019 +0200
Fixing warnings generated by clang 8.0 on Windows
* Deprecation removals previously specific to MSVC/Intel now also used
by clang
* String literals were assigned to non const pointers. These are stored
in mutable arrays now
* An implicit function pointer to pointer conversion is a Microsoft
extension warning is suppressed by an explicit reinterpret_cast
* The MSVC specific deprecation macro for jsoncpp was moved after the
clang macro to avoid redefinition warnings. This is consistent with
how jsoncpp fixed the issue in 36d8cfd7
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index c231ede..91f2adf 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -8,11 +8,16 @@ if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
set(_INTEL_WINDOWS 1)
endif()
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+ AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+ set(_CLANG_MSVC_WINDOWS 1)
+endif()
+
# Disable deprecation warnings for standard C functions.
# really only needed for newer versions of VS, but should
# not hurt other versions, and this will work into the
# future
-if(MSVC OR _INTEL_WINDOWS)
+if(MSVC OR _INTEL_WINDOWS OR _CLANG_MSVC_WINDOWS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
else()
endif()
@@ -21,9 +26,7 @@ if(MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:1000")
endif()
-if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
- AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
- AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+if(_CLANG_MSVC_WINDOWS AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL
"xGNU")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker
-stack:2000")
endif()
diff --git a/Source/cmCallVisualStudioMacro.cxx
b/Source/cmCallVisualStudioMacro.cxx
index 2f6cf64..f7a2244 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -61,7 +61,8 @@ HRESULT InstanceCallMacro(IDispatch* vsIDE, const
std::string& macro,
if (0 != vsIDE) {
DISPID dispid = (DISPID)-1;
-OLECHAR* name = L"ExecuteCommand";
+wchar_t execute_command[] = L"ExecuteCommand";
+OLECHAR* name = execute_command;
hr =
vsIDE->GetIDsOfNames(IID_NULL, ,
[Cmake-commits] CMake branch, master, updated. v3.14.4-1155-g05af177
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 05af1770a05e00d67f12f4e3ef294360d8d6480d (commit)
via 53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777 (commit)
from c68efd196eace176bed5216573d99fabba66df84 (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=05af1770a05e00d67f12f4e3ef294360d8d6480d
commit 05af1770a05e00d67f12f4e3ef294360d8d6480d
Merge: c68efd1 53cb1f2
Author: Brad King
AuthorDate: Thu May 30 13:39:23 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:39:35 2019 -0400
Merge topic 'tar-zstd-compression'
53cb1f2d04 cmake: Teach cmake -E tar command, Zstandard compression
Acked-by: Kitware Robot
Merge-request: !3357
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777
commit 53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777
Author: Bartosz Kosiorek
AuthorDate: Mon Mar 11 23:26:04 2019 +0100
Commit: Bartosz Kosiorek
CommitDate: Wed May 22 03:46:55 2019 +0200
cmake: Teach cmake -E tar command, Zstandard compression
Fixes #18657
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index df0d4c5..eddc3cb 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -546,20 +546,23 @@ Available commands are:
Compress the resulting archive with bzip2.
``J``
Compress the resulting archive with XZ.
- ``--``
-Stop interpreting options and treat all remaining arguments
-as file names even if they start in ``-``.
+ ``--zstd``
+Compress the resulting archive with Zstandard.
``--files-from=``
Read file names from the given file, one per line.
Blank lines are ignored. Lines may not start in ``-``
except for ``--add-file=`` to add files whose
names start in ``-``.
- ``--mtime=``
-Specify modification time recorded in tarball entries.
``--format=``
Specify the format of the archive to be created.
Supported formats are: ``7zip``, ``gnutar``, ``pax``,
``paxr`` (restricted pax, default), and ``zip``.
+ ``--mtime=``
+Specify modification time recorded in tarball entries.
+ ``--``
+Stop interpreting options and treat all remaining arguments
+as file names, even if they start with ``-``.
+
``time [...]``
Run command and display elapsed time.
diff --git a/Help/release/dev/cmake-e-tar-zstd-support.rst
b/Help/release/dev/cmake-e-tar-zstd-support.rst
new file mode 100644
index 000..e3488b5
--- /dev/null
+++ b/Help/release/dev/cmake-e-tar-zstd-support.rst
@@ -0,0 +1,7 @@
+Help/release/dev/cmake-e-tar-zstd-support
+-
+
+* The :manual:`cmake(1)` ``-E tar`` tool now support Zstandard compression
+ algorithm with ``--zstd`` option. Zstandard was designed to give
+ a compression ratio comparable to that of the DEFLATE (zip) algorithm,
+ but faster, especially for decompression.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 177ba02..359d57a 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -137,6 +137,13 @@ cmArchiveWrite::cmArchiveWrite(std::ostream& os, Compress
c,
return;
}
break;
+case CompressZstd:
+ if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) {
+this->Error = "archive_write_add_filter_zstd: ";
+this->Error += cm_archive_error_string(this->Archive);
+return;
+ }
+ break;
}
#if !defined(_WIN32) || defined(__CYGWIN__)
if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) {
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index 1f23dae..9ea88d3 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -49,7 +49,8 @@ public:
CompressGZip,
CompressBZip2,
CompressLZMA,
-CompressXZ
+CompressXZ,
+CompressZstd
};
/** Construct with output stream to which to write archive. */
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 545e6c5..4ba04ed 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1614,6 +1614,9 @@ bool cmSystemTools::CreateTar(const char* outFileName,
case TarCompressXZ:
compress = cmArchiveWrite::CompressXZ;
break;
+case TarCompressZstd:
+ compress = cmArchiveWrite::CompressZstd;
+ break;
case TarCompressNone:
compress = cmArchiveWrite::CompressNone;
break;
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index d145d47..64d6d7a 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -451,6 +451,7 @@ public:
[Cmake-commits] CMake branch, master, updated. v3.14.4-1153-gc68efd1
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 c68efd196eace176bed5216573d99fabba66df84 (commit) from 067a4f484b1e2f650918d90051653b5c434c77a2 (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=c68efd196eace176bed5216573d99fabba66df84 commit c68efd196eace176bed5216573d99fabba66df84 Author: Kitware Robot AuthorDate: Thu May 30 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Thu May 30 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 06fac72..63f1dce 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 20190529) +set(CMake_VERSION_PATCH 20190530) #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-1152-g067a4f4
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 067a4f484b1e2f650918d90051653b5c434c77a2 (commit) via 8b42d560028b8da0a3cf7e1a14962f2245d21227 (commit) via 5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231 (commit) via a1c291e0ac2cfe62e394842192b12e9e092c5a0b (commit) via f093ac36c0e389447af210d1f596baa5207bd6b3 (commit) via 0f9d7dc3ba2f6a82d6d0d54e7cc79899576981b8 (commit) via 4ff3ab2ac9d0c81c927d25117e5a14cb8e86 (commit) via a15595e4c9ae27677180b0b5374ead7a754be1f7 (commit) via 6baa80d1e31b26f06c68afddd096d3d8c5961718 (commit) via abea06efdfebbf5becfde40cb8ecc8427054edf1 (commit) via 26f2b65fec383bbab74f30c4b0bc6649d0b5b509 (commit) via 74829f01b13de0031e659bf8dac3e6672fbfa77b (commit) via 19669abe1d714d9dba3dcd642588160c0814f9e7 (commit) via a2a90f41e312ef1b6f60dd700db441e4b637d853 (commit) via 4819ff964714faec8ad2d92a3ee541b19196bcfc (commit) via 26af0b25e77ba48b6d015adef6d54b6725fd7977 (commit) via d44c0db0b2f8fa24b932b5c0d506fc8842baffd6 (commit) via b7d5ef23e9c9c76c7b8422c969ce806f9fd965e6 (commit) via 3d0210d8dc48f3e85f771b9e301ba867272c106d (commit) via 53fbe23f3fc6a6680308bb01edc02442ca9c7a57 (commit) from 7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 (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=067a4f484b1e2f650918d90051653b5c434c77a2 commit 067a4f484b1e2f650918d90051653b5c434c77a2 Merge: 8b42d56 74829f0 Author: Brad King AuthorDate: Wed May 29 13:21:53 2019 + Commit: Kitware Robot CommitDate: Wed May 29 09:22:12 2019 -0400 Merge topic 'clang-gnulike-support' 74829f01b1 Help: Add notes for topic 'clang-gnulike-support' 19669abe1d Tests: handle string escaping differences with NMake+clang a2a90f41e3 Tests: require C++14 for the Tutorial 4819ff9647 Tests: fix failures with gnu mode clang on windows 26af0b25e7 cmake: use correct stack size with gnu mode clang on windows d44c0db0b2 clang: setup correct configuration in gnu mode b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode 3d0210d8dc binutils: add the llvm-* variants to the tool lists. ... Acked-by: Kitware Robot Acked-by: Francesco Bertolaccini Acked-by: Stanislav Ershov Acked-by: Saleem Abdulrasool Merge-request: !2992 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b42d560028b8da0a3cf7e1a14962f2245d21227 commit 8b42d560028b8da0a3cf7e1a14962f2245d21227 Merge: 5a720a3 4ff3ab2 Author: Brad King AuthorDate: Wed May 29 13:18:27 2019 + Commit: Kitware Robot CommitDate: Wed May 29 09:19:38 2019 -0400 Merge topic 'FindZLIB-names' 4ff3ab2ac9 FindZLIB: Add more zlib library names Acked-by: Kitware Robot Merge-request: !3384 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231 commit 5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231 Merge: a1c291e a15595e Author: Brad King AuthorDate: Wed May 29 13:18:17 2019 + Commit: Kitware Robot CommitDate: Wed May 29 09:18:35 2019 -0400 Merge topic 'samu' a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM Acked-by: Kitware Robot Merge-request: !3380 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1c291e0ac2cfe62e394842192b12e9e092c5a0b commit a1c291e0ac2cfe62e394842192b12e9e092c5a0b Merge: f093ac3 6baa80d Author: Brad King AuthorDate: Wed May 29 13:15:40 2019 + Commit: Kitware Robot CommitDate: Wed May 29 09:17:44 2019 -0400 Merge topic 'swift-wrapper' 6baa80d1e3 Modules: correct linker wrapper flag for Swift Acked-by: Kitware Robot Merge-request: !3390 diff --cc Modules/CMakeSwiftInformation.cmake index 69e1519,6eed283..21f18d4 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@@ -19,15 -19,13 +19,16 @@@ endif( set(CMAKE_INCLUDE_FLAG_Swift "-I ") - set(CMAKE_Swift_DEFINE_FLAG -D) set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ") set(CMAKE_Swift_COMPILER_ARG1 -frontend) + set(CMAKE_Swift_DEFINE_FLAG -D) set(CMAKE_Swift_FRAMEWORK_SEARCH_FLAG "-F ") + set(CMAKE_Swift_LINKER_WRAPPER_FLAG "-Xlinker" " ") set(CMAKE_Swift_RESPONSE_FILE_LINK_FLAG @) +set(CMAKE_Swift_LINKER_PREFERENCE 50) +set(CMAKE_Swift_LINKER_PREFERENCE_PROPAGATES 1) + # NOTE(compnerd) use the short form for convenience and ease of search. They # are treated equivalent to their long form names as well as custom Swift # specific
[Cmake-commits] CMake branch, master, updated. v3.14.4-1132-g7c39a9c
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 7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 (commit) from c7db6ce98617aa846d213027c9ea9505f7d11d08 (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=7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 commit 7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 Author: Kitware Robot AuthorDate: Wed May 29 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Wed May 29 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 0a23023..06fac72 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 20190528) +set(CMake_VERSION_PATCH 20190529) #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-1131-gc7db6ce
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 c7db6ce98617aa846d213027c9ea9505f7d11d08 (commit)
via a7754448f66acc50427a04b1e5b699a041ae295a (commit)
from 45e4f470c02b16622c281371d30ecc0f7d71e5c6 (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=c7db6ce98617aa846d213027c9ea9505f7d11d08
commit c7db6ce98617aa846d213027c9ea9505f7d11d08
Merge: 45e4f47 a775444
Author: Brad King
AuthorDate: Tue May 28 18:59:32 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 14:59:48 2019 -0400
Merge topic 'flex'
a7754448f6 FindFLEX: fix example
Acked-by: Kitware Robot
Merge-request: !3379
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7754448f66acc50427a04b1e5b699a041ae295a
commit a7754448f66acc50427a04b1e5b699a041ae295a
Author: Marcin Ślusarz
AuthorDate: Sun May 26 22:30:49 2019 +0200
Commit: Marcin Ślusarz
CommitDate: Sun May 26 22:34:06 2019 +0200
FindFLEX: fix example
Binaries using flex must link with the detected library.
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 09d57d2..d22b7ec 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -95,6 +95,7 @@ respectively ``FLEX_TARGET`` and ``BISON_TARGET`` macros.
${BISON_MyParser_OUTPUTS}
${FLEX_MyScanner_OUTPUTS}
)
+ target_link_libraries(Foo ${FLEX_LIBRARIES})
#]===]
---
Summary of changes:
Modules/FindFLEX.cmake | 1 +
1 file changed, 1 insertion(+)
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-1129-g45e4f47
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 45e4f470c02b16622c281371d30ecc0f7d71e5c6 (commit) via dfd2e0a4ede4a7c31eb7132f8e74d234b260a519 (commit) via 22aabdfde0c3e73812b596c21479c8418075d644 (commit) via f326591c1369680541311eabe8d3eae6d1bce293 (commit) via f07d42632bd4f29eda871de12ebb5f03f9d4edda (commit) via a38b63c1bb2485f43054906f2e9697f9a3979ce6 (commit) via df6adb02c067a5714587365bc6ffdd90b342732c (commit) via 5bf07b9cfc5fda0c9d81f90e34761eb256733785 (commit) via b5ad572ac181c6e9754e31bd907abe59e7016d8a (commit) via 62d6ed79fb4cc4cdeb1a246f0f12db7e6031f4ba (commit) via 2b6f832bf52bf59241cd8de742bf95dbb4269c88 (commit) from 76cb43c7c5515e0ca8c1858311a54954fbc39870 (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=45e4f470c02b16622c281371d30ecc0f7d71e5c6 commit 45e4f470c02b16622c281371d30ecc0f7d71e5c6 Merge: dfd2e0a f07d426 Author: Brad King AuthorDate: Tue May 28 11:59:22 2019 -0400 Commit: Brad King CommitDate: Tue May 28 11:59:22 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfd2e0a4ede4a7c31eb7132f8e74d234b260a519 commit dfd2e0a4ede4a7c31eb7132f8e74d234b260a519 Merge: 22aabdf a38b63c Author: Brad King AuthorDate: Tue May 28 15:57:55 2019 + Commit: Kitware Robot CommitDate: Tue May 28 11:58:07 2019 -0400 Merge topic 'FindThreads-doc-c++' a38b63c1bb FindThreads: Drop incorrect docs about usage with C++ Acked-by: Kitware Robot Merge-request: !3391 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22aabdfde0c3e73812b596c21479c8418075d644 commit 22aabdfde0c3e73812b596c21479c8418075d644 Merge: f326591 df6adb0 Author: Brad King AuthorDate: Tue May 28 15:56:14 2019 + Commit: Kitware Robot CommitDate: Tue May 28 11:56:24 2019 -0400 Merge topic 'cmake_automoc_relaxed_mode_deprecation' df6adb02c0 Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODE 5bf07b9cfc Help: Mark CMAKE_AUTOMOC_RELAXED_MODE as deprecated b5ad572ac1 Autogen: Deprecation message for CMAKE_AUTOMOC_RELAXED_MODE Acked-by: Kitware Robot Merge-request: !3381 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f326591c1369680541311eabe8d3eae6d1bce293 commit f326591c1369680541311eabe8d3eae6d1bce293 Merge: 76cb43c 62d6ed7 Author: Brad King AuthorDate: Tue May 28 15:51:19 2019 + Commit: Kitware Robot CommitDate: Tue May 28 11:53:21 2019 -0400 Merge topic 'FindPython-find_framework' 62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup. Acked-by: Kitware Robot Merge-request: !3374 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df6adb02c067a5714587365bc6ffdd90b342732c commit df6adb02c067a5714587365bc6ffdd90b342732c Author: Sebastian Holtermann AuthorDate: Mon May 27 12:55:34 2019 +0200 Commit: Sebastian Holtermann CommitDate: Mon May 27 13:13:08 2019 +0200 Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODE diff --git a/Help/release/dev/cmake_automoc_relaxed_mode.rst b/Help/release/dev/cmake_automoc_relaxed_mode.rst new file mode 100644 index 000..aa4772a --- /dev/null +++ b/Help/release/dev/cmake_automoc_relaxed_mode.rst @@ -0,0 +1,5 @@ +cmake_automoc_relaxed_mode +-- + +* The variable :variable:`CMAKE_AUTOMOC_RELAXED_MODE` is considered + deprecated. Support still exists but will be removed in future versions. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bf07b9cfc5fda0c9d81f90e34761eb256733785 commit 5bf07b9cfc5fda0c9d81f90e34761eb256733785 Author: Sebastian Holtermann AuthorDate: Mon May 27 12:56:58 2019 +0200 Commit: Sebastian Holtermann CommitDate: Mon May 27 13:13:08 2019 +0200 Help: Mark CMAKE_AUTOMOC_RELAXED_MODE as deprecated diff --git a/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst b/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst index addc62d..6c0c61b 100644 --- a/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst +++ b/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst @@ -1,6 +1,8 @@ CMAKE_AUTOMOC_RELAXED_MODE -- +.. deprecated:: 3.15 + Switch between strict and relaxed automoc mode. By default, :prop_tgt:`AUTOMOC` behaves exactly as described in the https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5ad572ac181c6e9754e31bd907abe59e7016d8a commit b5ad572ac181c6e9754e31bd907abe59e7016d8a Author: Sebastian Holtermann AuthorDate: Mon May 27 12:30:45 2019 +0200 Commit: Sebastian
[Cmake-commits] CMake branch, release, updated. v3.14.4-6-gf07d426
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 f07d42632bd4f29eda871de12ebb5f03f9d4edda (commit) via a38b63c1bb2485f43054906f2e9697f9a3979ce6 (commit) via 2b6f832bf52bf59241cd8de742bf95dbb4269c88 (commit) via b915a4258550917cadb7cdd2f522b6e488b4db59 (commit) from fffb5f1a75ee4d2c909209e68a822596606f90a4 (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 | 10 ++ Modules/FindThreads.cmake | 3 --- 2 files changed, 10 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.4-1118-g76cb43c
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 76cb43c7c5515e0ca8c1858311a54954fbc39870 (commit)
via da0937c04fe8cb167a55a1e37cf275d24a262fa7 (commit)
via 56fec2fe8f7014abb5677fd4fca03fa208c498e8 (commit)
via da78d0f5ea5506602db9f761e559ff9057430c57 (commit)
via 59c392b44eb2920240b05a46e7f9c069ef374558 (commit)
via 9bf97363b0d0f3ba0bf89247ce4f8811b4286961 (commit)
via 3a0ab3ba2303784e20f1025cf3cd337d840a5b17 (commit)
via 9e5457d3b4f5c46028c29d731f4057e3fa76415a (commit)
via 3dfc8b9bd6b75d35b959ee4a79c056f4af8ea28a (commit)
from 540640fc0aca7f181098b0270fb1cae1cd684791 (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=76cb43c7c5515e0ca8c1858311a54954fbc39870
commit 76cb43c7c5515e0ca8c1858311a54954fbc39870
Merge: da0937c 3dfc8b9
Author: Brad King
AuthorDate: Tue May 28 15:50:29 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 11:51:58 2019 -0400
Merge topic 'GetPrerequisites-use-if-IN_LIST'
3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach
Acked-by: Kitware Robot
Merge-request: !3299
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0937c04fe8cb167a55a1e37cf275d24a262fa7
commit da0937c04fe8cb167a55a1e37cf275d24a262fa7
Merge: 56fec2f 9e5457d
Author: Brad King
AuthorDate: Tue May 28 15:49:43 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 11:50:28 2019 -0400
Merge topic 'swift-response'
9e5457d3b4 Ninja,Swift: correct response file handling
Acked-by: Kitware Robot
Merge-request: !3367
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56fec2fe8f7014abb5677fd4fca03fa208c498e8
commit 56fec2fe8f7014abb5677fd4fca03fa208c498e8
Merge: da78d0f 59c392b
Author: Brad King
AuthorDate: Tue May 28 15:49:09 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 11:49:17 2019 -0400
Merge topic 'FindICU-find-names'
59c392b44e FindICU: Pass explicit NAMES argument to find command calls
Acked-by: Kitware Robot
Merge-request: !3371
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da78d0f5ea5506602db9f761e559ff9057430c57
commit da78d0f5ea5506602db9f761e559ff9057430c57
Merge: 540640f 9bf9736
Author: Brad King
AuthorDate: Tue May 28 15:42:38 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 11:43:24 2019 -0400
Merge topic 'rel-push'
9bf97363b0 Utilities/Release: Replace upload step with a "push" script
3a0ab3ba23 Utilities/Release: Teach upload script to compute version
automatically
Acked-by: Kitware Robot
Merge-request: !3370
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59c392b44eb2920240b05a46e7f9c069ef374558
commit 59c392b44eb2920240b05a46e7f9c069ef374558
Author: Brad King
AuthorDate: Fri May 24 10:30:08 2019 -0400
Commit: Brad King
CommitDate: Fri May 24 10:31:35 2019 -0400
FindICU: Pass explicit NAMES argument to find command calls
This improves readability and avoids an undocumented signature variant.
Fixes: #19302
diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index e4b4909..38081f5 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -162,7 +162,8 @@ function(_ICU_FIND)
string(TOUPPER "${program}" program_upcase)
set(cache_var "ICU_${program_upcase}_EXECUTABLE")
set(program_var "ICU_${program_upcase}_EXECUTABLE")
-find_program("${cache_var}" "${program}"
+find_program("${cache_var}"
+ NAMES "${program}"
HINTS ${icu_roots}
PATH_SUFFIXES ${icu_binary_suffixes}
DOC "ICU ${program} executable"
@@ -228,13 +229,15 @@ function(_ICU_FIND)
list(APPEND component_libnames ${static_component_libnames})
list(APPEND component_debug_libnames ${static_component_debug_libnames})
endif()
-find_library("${component_cache_release}" ${component_libnames}
+find_library("${component_cache_release}"
+ NAMES ${component_libnames}
HINTS ${icu_roots}
PATH_SUFFIXES ${icu_library_suffixes}
DOC "ICU ${component} library (release)"
NO_PACKAGE_ROOT_PATH
)
-find_library("${component_cache_debug}" ${component_debug_libnames}
+find_library("${component_cache_debug}"
+ NAMES ${component_debug_libnames}
HINTS ${icu_roots}
PATH_SUFFIXES ${icu_library_suffixes}
DOC "ICU ${component} library (debug)"
@@ -286,7 +289,8 @@ function(_ICU_FIND)
string(REPLACE "." "_" data_upcase "${data_upcase}")
set(cache_var "ICU_${data_upcase}")
set(data_var
[Cmake-commits] CMake branch, master, updated. v3.14.4-1109-g540640f
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 540640fc0aca7f181098b0270fb1cae1cd684791 (commit)
via b915a4258550917cadb7cdd2f522b6e488b4db59 (commit)
from e13b18e2c70f42c23ed7e7fddb93557ce19b7359 (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=540640fc0aca7f181098b0270fb1cae1cd684791
commit 540640fc0aca7f181098b0270fb1cae1cd684791
Merge: e13b18e b915a42
Author: Brad King
AuthorDate: Tue May 28 15:42:02 2019 +
Commit: Kitware Robot
CommitDate: Tue May 28 11:42:12 2019 -0400
Merge topic 'FindBoost-contract-requires-compile-features'
b915a42585 FindBoost: Add compiler features for Boost Contract library
Acked-by: Kitware Robot
Merge-request: !3368
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b915a4258550917cadb7cdd2f522b6e488b4db59
commit b915a4258550917cadb7cdd2f522b6e488b4db59
Author: Alex Turbov
AuthorDate: Fri May 24 19:12:44 2019 +0900
Commit: Brad King
CommitDate: Fri May 24 07:13:56 2019 -0400
FindBoost: Add compiler features for Boost Contract library
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 552c2fd..6a59dff 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1075,6 +1075,16 @@ function(_Boost_COMPILER_FEATURES component _ret)
# Compiler feature for `context` same as for `fiber`.
set(_Boost_CONTEXT_COMPILER_FEATURES ${_Boost_FIBER_COMPILER_FEATURES})
endif()
+
+ # Boost Contract library available in >= 1.67
+ if(NOT Boost_VERSION_STRING VERSION_LESS 1.67.0)
+# From `libs/contract/build/boost_contract_build.jam`
+set(_Boost_CONTRACT_COMPILER_FEATURES
+cxx_lambdas
+cxx_variadic_templates
+)
+ endif()
+
string(TOUPPER ${component} uppercomponent)
set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
endfunction()
---
Summary of changes:
Modules/FindBoost.cmake | 10 ++
1 file changed, 10 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.4-1107-ge13b18e
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 e13b18e2c70f42c23ed7e7fddb93557ce19b7359 (commit) from ed593cbe645d7e5a0131b0695a607999e70af5c6 (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=e13b18e2c70f42c23ed7e7fddb93557ce19b7359 commit e13b18e2c70f42c23ed7e7fddb93557ce19b7359 Author: Kitware Robot AuthorDate: Tue May 28 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Tue May 28 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 69f3f97..0a23023 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 20190527) +set(CMake_VERSION_PATCH 20190528) #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-1106-ged593cb
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 ed593cbe645d7e5a0131b0695a607999e70af5c6 (commit) via 711f1bf1db0bbfb64323f81ee52864560776ebff (commit) via b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc (commit) via 902af25512545db441043ea8f1fd2637fa1e1129 (commit) from c0e763d6880e842d8fc874e58c93583e014bd988 (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=ed593cbe645d7e5a0131b0695a607999e70af5c6 commit ed593cbe645d7e5a0131b0695a607999e70af5c6 Merge: 711f1bf 902af25 Author: Craig Scott AuthorDate: Mon May 27 21:55:29 2019 + Commit: Kitware Robot CommitDate: Mon May 27 17:55:45 2019 -0400 Merge topic 'doc-typo-CTEST_CUSTOM_WARNING_xxx' 902af25512 Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars Acked-by: Kitware Robot Merge-request: !3378 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=711f1bf1db0bbfb64323f81ee52864560776ebff commit 711f1bf1db0bbfb64323f81ee52864560776ebff Merge: c0e763d b7b7f18 Author: Craig Scott AuthorDate: Mon May 27 21:53:04 2019 + Commit: Kitware Robot CommitDate: Mon May 27 17:53:43 2019 -0400 Merge topic 'doc-install-export-android-mk' b7b7f1806a Help: Fix typo in install(EXPORT_ANDROID_MK) example Acked-by: Kitware Robot Merge-request: !3376 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc commit b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc Author: John Freeman AuthorDate: Sat May 25 14:57:08 2019 -0400 Commit: John Freeman CommitDate: Sun May 26 09:09:07 2019 -0500 Help: Fix typo in install(EXPORT_ANDROID_MK) example diff --git a/Help/command/install.rst b/Help/command/install.rst index 7571aae..ab6fef6 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -660,9 +660,9 @@ and installed by the current project. For example, the code install(TARGETS myexe EXPORT myproj DESTINATION bin) install(EXPORT myproj NAMESPACE mp_ DESTINATION lib/myproj) - install(EXPORT_ANDROID_MK myexp DESTINATION share/ndk-modules) + install(EXPORT_ANDROID_MK myproj DESTINATION share/ndk-modules) -will install the executable myexe to ``/bin`` and code to import +will install the executable ``myexe`` to ``/bin`` and code to import it in the file ``/lib/myproj/myproj.cmake`` and ``/share/ndk-modules/Android.mk``. An outside project may load this file with the include command and reference the ``myexe`` https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=902af25512545db441043ea8f1fd2637fa1e1129 commit 902af25512545db441043ea8f1fd2637fa1e1129 Author: Craig Scott AuthorDate: Sun May 26 22:30:39 2019 +1000 Commit: Craig Scott CommitDate: Sun May 26 22:31:23 2019 +1000 Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars These variables apply to the `ctest_build` command, not `ctest_test` Relates: #19217 diff --git a/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst b/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst index 36fa37d..a03d473 100644 --- a/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst +++ b/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst @@ -2,6 +2,6 @@ CTEST_CUSTOM_WARNING_EXCEPTION -- A list of regular expressions which will be used to exclude when detecting -warning messages in build outputs by the :command:`ctest_test` command. +warning messages in build outputs by the :command:`ctest_build` command. .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst b/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst index a35be96..18aa6b3 100644 --- a/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst +++ b/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst @@ -2,6 +2,6 @@ CTEST_CUSTOM_WARNING_MATCH -- A list of regular expressions which will be used to detect warning messages in -build outputs by the :command:`ctest_test` command. +build outputs by the :command:`ctest_build` command. .. include:: CTEST_CUSTOM_XXX.txt --- Summary of changes: Help/command/install.rst | 4 ++-- Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst | 2 +- Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst | 2 +- 3 files changed, 4 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.4-1102-gc0e763d
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 c0e763d6880e842d8fc874e58c93583e014bd988 (commit) from 63f149f5989ea4adfa522cec63a954b5059c223c (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=c0e763d6880e842d8fc874e58c93583e014bd988 commit c0e763d6880e842d8fc874e58c93583e014bd988 Author: Kitware Robot AuthorDate: Mon May 27 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Mon May 27 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9325305..69f3f97 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 20190526) +set(CMake_VERSION_PATCH 20190527) #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-1101-g63f149f
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 63f149f5989ea4adfa522cec63a954b5059c223c (commit) from e32f8393388d28de7d713f35d076a33060368ec3 (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=63f149f5989ea4adfa522cec63a954b5059c223c commit 63f149f5989ea4adfa522cec63a954b5059c223c Author: Kitware Robot AuthorDate: Sun May 26 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun May 26 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 17632c7..9325305 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 20190525) +set(CMake_VERSION_PATCH 20190526) #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-1100-ge32f839
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 e32f8393388d28de7d713f35d076a33060368ec3 (commit) from 4ec2b999414495ae58871755307ea17f391f7910 (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=e32f8393388d28de7d713f35d076a33060368ec3 commit e32f8393388d28de7d713f35d076a33060368ec3 Author: Kitware Robot AuthorDate: Sat May 25 00:01:11 2019 -0400 Commit: Kitware Robot CommitDate: Sat May 25 00:01:11 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 386dbbf..17632c7 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 20190524) +set(CMake_VERSION_PATCH 20190525) #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-1099-g4ec2b99
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 4ec2b999414495ae58871755307ea17f391f7910 (commit)
via c8e217e0a70f8f445e2c593f44e1105c959fb9d7 (commit)
from 2b8e5a3ba772d6df6e56a28d8645127008636b03 (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=4ec2b999414495ae58871755307ea17f391f7910
commit 4ec2b999414495ae58871755307ea17f391f7910
Merge: 2b8e5a3 c8e217e
Author: Brad King
AuthorDate: Fri May 24 14:41:43 2019 +
Commit: Kitware Robot
CommitDate: Fri May 24 10:43:14 2019 -0400
Merge topic 'selective-tar-extracting-and-listing'
c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives
Acked-by: Kitware Robot
Merge-request: !3342
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8e217e0a70f8f445e2c593f44e1105c959fb9d7
commit c8e217e0a70f8f445e2c593f44e1105c959fb9d7
Author: Bartosz Kosiorek
AuthorDate: Wed May 22 21:29:08 2019 +0200
Commit: Brad King
CommitDate: Thu May 23 10:08:22 2019 -0400
cmake: tar: Allow selective extracting and listing of archives
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index df0d4c5..97c65e7 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -528,16 +528,22 @@ Available commands are:
``sleep ...``
Sleep for given number of seconds.
-``tar [cxt][vf][zjJ] file.tar [] [--] [...]``
+``tar [cxt][vf][zjJ] file.tar [] [--] [...]``
Create or extract a tar or zip archive. Options are:
``c``
Create a new archive containing the specified files.
-If used, the argument is mandatory.
+If used, the ``...`` argument is mandatory.
``x``
Extract to disk from the archive.
+The ``...`` argument could be used to extract only selected files
+or directories.
+When extracting selected files or directories, you must provide their exact
+names including the path, as printed by list (``-t``).
``t``
-List archive contents to stdout.
+List archive contents.
+The ``...`` argument could be used to list only selected files
+or directories.
``v``
Produce verbose output.
``z``
diff --git a/Help/release/dev/cmake-e-tar-extract-specific-files.rst
b/Help/release/dev/cmake-e-tar-extract-specific-files.rst
new file mode 100644
index 000..4ab3eab
--- /dev/null
+++ b/Help/release/dev/cmake-e-tar-extract-specific-files.rst
@@ -0,0 +1,8 @@
+cmake-e-tar-extract-specific-files
+--
+
+* The :manual:`cmake(1)` ``-E tar`` tool allow for extract (``-x``) or list
+ (``-t``) only specific files or directories. To select pathnames append
+ a space-separated list of file names or directories.
+ When extracting selected files or directories, you must provide their exact
+ pathname, as printed by list (``-t``)
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 6359d60..d00d4d0 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1757,7 +1757,9 @@ bool copy_data(struct archive* ar, struct archive* aw)
# endif
}
-bool extract_tar(const char* outFileName, bool verbose, bool extract)
+bool extract_tar(const char* outFileName,
+ const std::vector& files, bool verbose,
+ bool extract)
{
cmLocaleRAII localeRAII;
static_cast(localeRAII);
@@ -1766,6 +1768,21 @@ bool extract_tar(const char* outFileName, bool verbose,
bool extract)
archive_read_support_filter_all(a);
archive_read_support_format_all(a);
struct archive_entry* entry;
+
+ struct archive* matching = archive_match_new();
+ if (matching == nullptr) {
+cmSystemTools::Error("Out of memory");
+return false;
+ }
+
+ for (const auto& filename : files) {
+if (archive_match_include_pattern(matching, filename.c_str()) !=
+ARCHIVE_OK) {
+ cmSystemTools::Error("Failed to add to inclusion list: " + filename);
+ return false;
+}
+ }
+
int r = cm_archive_read_open_file(a, outFileName, 10240);
if (r) {
ArchiveError("Problem with archive_read_open_file(): ", a);
@@ -1782,6 +1799,11 @@ bool extract_tar(const char* outFileName, bool verbose,
bool extract)
ArchiveError("Problem with archive_read_next_header(): ", a);
break;
}
+
+if (archive_match_excluded(matching, entry)) {
+ continue;
+}
+
if (verbose) {
if (extract) {
cmSystemTools::Stdout("x ");
@@ -1827,6 +1849,27 @@ bool extract_tar(const char* outFileName, bool verbose,
bool extract)
}
}
}
+
+ bool error_occured = false;
+ if (matching != nullptr) {
+const char* p;
+int ar;
[Cmake-commits] CMake branch, master, updated. v3.14.4-1083-gc22693b
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 c22693b99df12f540480438275cd5bae1cfc5846 (commit) from f03a80aefd4073bc1502c2e486fedfdbd8addfb6 (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=c22693b99df12f540480438275cd5bae1cfc5846 commit c22693b99df12f540480438275cd5bae1cfc5846 Author: Kitware Robot AuthorDate: Fri May 24 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 24 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6948abd..386dbbf 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 20190523) +set(CMake_VERSION_PATCH 20190524) #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-1082-gf03a80a
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 f03a80aefd4073bc1502c2e486fedfdbd8addfb6 (commit)
via 5a1af142f120ccc6834efcf786e346b06e0f05c6 (commit)
from a4faf7788cc40b17c48a9393cd15425ee65abfd9 (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=f03a80aefd4073bc1502c2e486fedfdbd8addfb6
commit f03a80aefd4073bc1502c2e486fedfdbd8addfb6
Merge: a4faf77 5a1af14
Author: Brad King
AuthorDate: Thu May 23 13:22:25 2019 +
Commit: Kitware Robot
CommitDate: Thu May 23 09:22:37 2019 -0400
Merge topic 'genex-target-property-lifetime'
5a1af142f1 Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation
Acked-by: Kitware Robot
Merge-request: !3362
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a1af142f120ccc6834efcf786e346b06e0f05c6
commit 5a1af142f120ccc6834efcf786e346b06e0f05c6
Author: Brad King
AuthorDate: Wed May 22 09:56:19 2019 -0400
Commit: Brad King
CommitDate: Wed May 22 10:19:41 2019 -0400
Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation
For special properties like `INCLUDE_DIRECTORIES`, the pointer returned
by `cmTarget::GetProperty` is only valid until the next time the same
special property is queried on *any* target. When evaluating a nested
`TARGET_PROPERTY` generator expression we may look up such a property
more than once on different targets. Fix `TargetPropertyNode::Evaluate`
to store the lookup result in locally owned memory earlier.
Fixes: #19286
diff --git a/Source/cmGeneratorExpressionNode.cxx
b/Source/cmGeneratorExpressionNode.cxx
index 709355a..68ef170 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1215,7 +1215,12 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
break;
}
-const char* prop = target->GetProperty(propertyName);
+std::string prop;
+bool haveProp = false;
+if (const char* p = target->GetProperty(propertyName)) {
+ prop = p;
+ haveProp = true;
+}
if (dagCheckerParent) {
if (dagCheckerParent->EvaluatingGenexExpression() ||
@@ -1235,7 +1240,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
}
#undef TRANSITIVE_PROPERTY_COMPARE
-if (!prop) {
+if (!haveProp) {
return std::string();
}
} else {
@@ -1291,7 +1296,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
}
}
-if (!prop) {
+if (!haveProp) {
if (target->IsImported() ||
target->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
return linkedTargetsContent;
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 8abf70d..68a0172 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -53,6 +53,7 @@ run_cmake_with_options(TARGET_FILE_BASE_NAME
-DCMAKE_BUILD_TYPE:STRING=Debug)
run_cmake_with_options(TARGET_FILE_BASE_NAME-imported-target
-DCMAKE_BUILD_TYPE:STRING=Debug)
run_cmake(TARGET_FILE_BASE_NAME-non-valid-target)
run_cmake(TARGET_LINKER_FILE_BASE_NAME-non-valid-target)
+run_cmake(TARGET_PROPERTY-INCLUDE_DIRECTORIES)
run_cmake(TARGET_PROPERTY-LOCATION)
run_cmake(TARGET_PROPERTY-SOURCES)
run_cmake(LINK_ONLY-not-linking)
diff --git
a/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-INCLUDE_DIRECTORIES.cmake
b/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-INCLUDE_DIRECTORIES.cmake
new file mode 100644
index 000..cb6f4d8
--- /dev/null
+++
b/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-INCLUDE_DIRECTORIES.cmake
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.14)
+enable_language(C)
+
+add_library(foo1 STATIC empty.c)
+target_include_directories(foo1 PUBLIC include)
+target_link_libraries(foo1 PRIVATE foo2 foo3 foo4)
+
+add_library(foo2 STATIC empty.c)
+target_include_directories(foo2 PUBLIC
$)
+
+add_library(foo3 STATIC empty.c)
+target_include_directories(foo3 PUBLIC
$)
+
+add_library(foo4 STATIC empty.c)
+target_include_directories(foo4 PUBLIC
$)
+
+# Evaluate a genex that looks up INCLUDE_DIRECTORIES on multiple targets.
+file(GENERATE OUTPUT out.txt CONTENT
"$")
---
Summary of changes:
Source/cmGeneratorExpressionNode.cxx | 11 ---
Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake | 1 +
[Cmake-commits] CMake branch, master, updated. v3.14.4-1080-ga4faf77
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 a4faf7788cc40b17c48a9393cd15425ee65abfd9 (commit)
via e884b1b69365e9dc15fff572a6ff2237c1bb7644 (commit)
from 22df62b58d8e2b9af5e754f4ed413d90088eb79e (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=a4faf7788cc40b17c48a9393cd15425ee65abfd9
commit a4faf7788cc40b17c48a9393cd15425ee65abfd9
Merge: 22df62b e884b1b
Author: Brad King
AuthorDate: Thu May 23 12:54:16 2019 +
Commit: Kitware Robot
CommitDate: Thu May 23 09:05:47 2019 -0400
Merge topic 'string-error'
e884b1b693 cmSystemTools::Error(): remove const char* overload
Acked-by: Kitware Robot
Merge-request: !3360
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e884b1b69365e9dc15fff572a6ff2237c1bb7644
commit e884b1b69365e9dc15fff572a6ff2237c1bb7644
Author: Vitaly Stakhovsky
AuthorDate: Wed May 22 09:16:42 2019 -0400
Commit: Brad King
CommitDate: Wed May 22 10:51:06 2019 -0400
cmSystemTools::Error(): remove const char* overload
diff --git a/Source/CTest/cmCTestScriptHandler.cxx
b/Source/CTest/cmCTestScriptHandler.cxx
index 43cfe16..a739f44 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -447,7 +447,8 @@ int cmCTestScriptHandler::ExtractVariables()
if (updateVal) {
if (this->UpdateCmd.empty()) {
cmSystemTools::Error(
- updateVar, " specified without specifying CTEST_CVS_COMMAND.");
+ std::string(updateVar) +
+ " specified without specifying CTEST_CVS_COMMAND.");
return 12;
}
this->ExtraUpdates.emplace_back(updateVal);
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index e7ed097..c1dd591 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -83,7 +83,7 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
break;
}
case cmStateEnums::UNINITIALIZED:
- cmSystemTools::Error("Found an undefined variable: ", key.c_str());
+ cmSystemTools::Error("Found an undefined variable: " + key);
break;
default:
// TODO : put warning message here
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 5efc784..255a8e6 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -167,8 +167,8 @@ void CCONV cmAddLinkDirectoryForTarget(void* arg, const
char* tgt,
cmTarget* t = mf->FindLocalNonAliasTarget(tgt);
if (!t) {
cmSystemTools::Error(
- "Attempt to add link directories to non-existent target: ", tgt,
- " for directory ", d);
+ "Attempt to add link directories to non-existent target: " +
+ std::string(tgt) + " for directory " + std::string(d));
return;
}
t->InsertLinkDirectory(d, mf->GetBacktrace());
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 6116de0..358f095 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -308,8 +308,7 @@ bool cmCacheManager::SaveCache(const std::string& path,
cmMessenger* messenger)
if (!ce.Initialized) {
/*
// This should be added in, but is not for now.
- cmSystemTools::Error("Cache entry \"", (*i).first.c_str(),
- "\" is uninitialized");
+ cmSystemTools::Error("Cache entry \"" + i.first + "\" is uninitialized");
*/
} else if (t != cmStateEnums::INTERNAL) {
// Format is key:type=value
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index b08dd1c..3495f2a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1798,10 +1798,10 @@ int cmGlobalGenerator::Build(
output += "\n";
if (workdir.Failed()) {
cmSystemTools::SetRunCommandHideConsole(hideconsole);
-cmSystemTools::Error("Failed to change directory: ",
- std::strerror(workdir.GetLastResult()));
-output += "Failed to change directory: ";
-output += std::strerror(workdir.GetLastResult());
+std::string err = "Failed to change directory: ";
+err += std::strerror(workdir.GetLastResult());
+cmSystemTools::Error(err);
+output += err;
output += "\n";
return 1;
}
diff --git a/Source/cmInstallExportAndroidMKGenerator.cxx
b/Source/cmInstallExportAndroidMKGenerator.cxx
index 7de3dd4..55d3685 100644
--- a/Source/cmInstallExportAndroidMKGenerator.cxx
+++ b/Source/cmInstallExportAndroidMKGenerator.cxx
@@ -44,7 +44,7 @@ void
[Cmake-commits] CMake branch, master, updated. v3.14.4-1078-g22df62b
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 22df62b58d8e2b9af5e754f4ed413d90088eb79e (commit) via 4f739a4e47d450406818804e45e5daaf452b39a8 (commit) via 5222400d9f574b5f953a2fe1d2c95a9754c683f3 (commit) via cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d (commit) via 79c6a573f4c6690914511e4e1894221a94f1b3e3 (commit) via d1a570f18c47bb840fc19a9979d3970fbaa7e58a (commit) via 8ee6584a9975e766047fd73815a81a8d9c7db3f5 (commit) via 5b53cfda247f7d688a058f358628639a431313a8 (commit) via 9c576a88d95b302882bcb0a021dcf03982a40902 (commit) via 4b45a5d5c7f9266e5ca08f6d5676759b9aac4235 (commit) via 02c14b7fcd29a7dcedb930fe5d9138cb185493e1 (commit) via 24223ac84bd1610cef2ab0935233387227653dfd (commit) via 7e636fd8e0f10c8e0ba5eea529f4fedffd899ecf (commit) via 0fbf936b4630ca9db0d492d8c7e583f45d959b45 (commit) via 8517b549f44eb41c93eb1c448de176ad4172f083 (commit) via 9f205acefe256ac9707cd500ea1d421916f013cd (commit) via 26ea022c3bf081d9e1f7266e5ae52719cb59301b (commit) from d7e70d01fe510b6f5760a88cc6f244cbc0ed5f32 (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=22df62b58d8e2b9af5e754f4ed413d90088eb79e commit 22df62b58d8e2b9af5e754f4ed413d90088eb79e Merge: 4f739a4 24223ac Author: Brad King AuthorDate: Thu May 23 12:53:16 2019 + Commit: Kitware Robot CommitDate: Thu May 23 09:02:55 2019 -0400 Merge topic 'swift-flag-variables' 24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags 7e636fd8e0 Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG` 0fbf936b46 Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift` Acked-by: Kitware Robot Merge-request: !3353 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f739a4e47d450406818804e45e5daaf452b39a8 commit 4f739a4e47d450406818804e45e5daaf452b39a8 Merge: 5222400 8ee6584 Author: Brad King AuthorDate: Thu May 23 12:53:57 2019 + Commit: Kitware Robot CommitDate: Thu May 23 09:01:04 2019 -0400 Merge topic 'compiler-launcher-shell-format' 8ee6584a99 Ninja,Makefile: Fix _COMPILER_LAUNCHER shell command syntax Acked-by: Kitware Robot Merge-request: !3361 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5222400d9f574b5f953a2fe1d2c95a9754c683f3 commit 5222400d9f574b5f953a2fe1d2c95a9754c683f3 Merge: cbd1c5b 8517b54 Author: Brad King AuthorDate: Thu May 23 12:52:47 2019 + Commit: Kitware Robot CommitDate: Thu May 23 08:59:25 2019 -0400 Merge topic 'FindPython-find_strategy' 8517b549f4 FindPython: Add policy to manage lookup stratgey default. 9f205acefe FindPython: Implement lookup strategies. Acked-by: Kitware Robot Merge-request: !3354 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d commit cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d Merge: 79c6a57 26ea022 Author: Brad King AuthorDate: Thu May 23 12:52:12 2019 + Commit: Kitware Robot CommitDate: Thu May 23 08:57:36 2019 -0400 Merge topic 'framework-var' 26ea022c3b Add variable CMAKE_FRAMEWORK Acked-by: Kitware Robot Merge-request: !3347 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79c6a573f4c6690914511e4e1894221a94f1b3e3 commit 79c6a573f4c6690914511e4e1894221a94f1b3e3 Merge: d1a570f 02c14b7 Author: Brad King AuthorDate: Thu May 23 12:53:24 2019 + Commit: Kitware Robot CommitDate: Thu May 23 08:55:16 2019 -0400 Merge topic 'swift-flags' 02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES Acked-by: Kitware Robot Merge-request: !3355 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1a570f18c47bb840fc19a9979d3970fbaa7e58a commit d1a570f18c47bb840fc19a9979d3970fbaa7e58a Merge: d7e70d0 5b53cfd Author: Brad King AuthorDate: Thu May 23 12:51:39 2019 + Commit: Kitware Robot CommitDate: Thu May 23 08:53:17 2019 -0400 Merge topic 'cmFileTimes' 5b53cfda24 cmSystemTools: Remove cmSystemToolsFileTime interface 9c576a88d9 Use cmFileTimes instead of cmSystemToolsFileTime interface 4b45a5d5c7 cmFileTimes: New RAII based cmFileTimes class Acked-by: Kitware Robot Merge-request: !3358 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee6584a9975e766047fd73815a81a8d9c7db3f5 commit 8ee6584a9975e766047fd73815a81a8d9c7db3f5 Author: Brad King AuthorDate: Wed May 22 09:30:38 2019 -0400 Commit: Brad King CommitDate: Wed May 22 10:47:15 2019 -0400 Ninja,Makefile: Fix _COMPILER_LAUNCHER shell
[Cmake-commits] CMake branch, master, updated. v3.14.4-1061-gd7e70d0
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 d7e70d01fe510b6f5760a88cc6f244cbc0ed5f32 (commit)
via 71d6a1455e402755023b509629971afd1ed98922 (commit)
from 22d58e07e5dc54e113ae7414dea604549b0cfc43 (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=d7e70d01fe510b6f5760a88cc6f244cbc0ed5f32
commit d7e70d01fe510b6f5760a88cc6f244cbc0ed5f32
Merge: 22d58e0 71d6a14
Author: Brad King
AuthorDate: Thu May 23 12:51:29 2019 +
Commit: Kitware Robot
CommitDate: Thu May 23 08:51:38 2019 -0400
Merge topic 'autogen_compiler_features'
71d6a1455e Autogen: Evaluate compiler features for the same exectuable only
once
Acked-by: Kitware Robot
Merge-request: !3359
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71d6a1455e402755023b509629971afd1ed98922
commit 71d6a1455e402755023b509629971afd1ed98922
Author: Sebastian Holtermann
AuthorDate: Wed May 22 12:09:31 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Wed May 22 12:25:17 2019 +0200
Autogen: Evaluate compiler features for the same exectuable only once
To speed up the `AUTOGEN` configuration process, evaluate the compiler
features only once. The feature evaluation result is stored in the new
class
`cmQtAutoGen::CompilerFeatures`, and the instance is shared by using
`std::shared_ptr`.
diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h
index 3a346b5..9c52129 100644
--- a/Source/cmQtAutoGen.h
+++ b/Source/cmQtAutoGen.h
@@ -5,6 +5,7 @@
#include "cmConfigure.h" // IWYU pragma: keep
+#include // IWYU pragma: keep
#include
#include
@@ -40,6 +41,15 @@ public:
}
};
+ class CompilerFeatures
+ {
+ public:
+bool Evaluated = false;
+std::string HelpOutput;
+std::vector ListOptions;
+ };
+ typedef std::shared_ptr CompilerFeaturesHandle;
+
/// @brief AutoGen generator type
enum class GenT
{
diff --git a/Source/cmQtAutoGenGlobalInitializer.cxx
b/Source/cmQtAutoGenGlobalInitializer.cxx
index 59e17d7..ef8a56b 100644
--- a/Source/cmQtAutoGenGlobalInitializer.cxx
+++ b/Source/cmQtAutoGenGlobalInitializer.cxx
@@ -203,19 +203,16 @@ void cmQtAutoGenGlobalInitializer::AddToGlobalAutoRcc(
}
}
-bool cmQtAutoGenGlobalInitializer::GetExecutableTestOutput(
+cmQtAutoGen::CompilerFeaturesHandle
+cmQtAutoGenGlobalInitializer::GetCompilerFeatures(
std::string const& generator, std::string const& executable,
- std::string& error, std::string* output)
+ std::string& error)
{
- // Check if we have cached output
+ // Check if we have cached features
{
-auto it = this->ExecutableTestOutputs_.find(executable);
-if (it != this->ExecutableTestOutputs_.end()) {
- // Return output on demand
- if (output != nullptr) {
-*output = it->second;
- }
- return true;
+auto it = this->CompilerFeatures_.find(executable);
+if (it != this->CompilerFeatures_.end()) {
+ return it->second;
}
}
@@ -226,7 +223,7 @@ bool cmQtAutoGenGlobalInitializer::GetExecutableTestOutput(
error += "\" executable ";
error += cmQtAutoGen::Quoted(executable);
error += " does not exist.";
-return false;
+return cmQtAutoGen::CompilerFeaturesHandle();
}
// Test the executable
@@ -234,7 +231,7 @@ bool cmQtAutoGenGlobalInitializer::GetExecutableTestOutput(
{
std::string stdErr;
std::vector command;
-command.push_back(executable);
+command.emplace_back(executable);
command.emplace_back("-h");
int retVal = 0;
const bool runResult = cmSystemTools::RunSingleCommand(
@@ -250,19 +247,19 @@ bool
cmQtAutoGenGlobalInitializer::GetExecutableTestOutput(
error += stdOut;
error += "\n";
error += stdErr;
- return false;
+ return cmQtAutoGen::CompilerFeaturesHandle();
}
}
- // Return executable output on demand
- if (output != nullptr) {
-*output = stdOut;
- }
+ // Create valid handle
+ cmQtAutoGen::CompilerFeaturesHandle res =
+std::make_shared();
+ res->HelpOutput = std::move(stdOut);
- // Register executable and output
- this->ExecutableTestOutputs_.emplace(executable, std::move(stdOut));
+ // Register compiler features
+ this->CompilerFeatures_.emplace(executable, res);
- return true;
+ return res;
}
bool cmQtAutoGenGlobalInitializer::generate()
diff --git a/Source/cmQtAutoGenGlobalInitializer.h
b/Source/cmQtAutoGenGlobalInitializer.h
index 77429b7..d56153a 100644
--- a/Source/cmQtAutoGenGlobalInitializer.h
+++ b/Source/cmQtAutoGenGlobalInitializer.h
@@ -5,6 +5,8 @@
#include "cmConfigure.h" // IWYU
[Cmake-commits] CMake branch, master, updated. v3.14.4-1059-g22d58e0
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 22d58e07e5dc54e113ae7414dea604549b0cfc43 (commit) from 8ed6efbbd377c0941ba018200282fc961aa7d20e (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=22d58e07e5dc54e113ae7414dea604549b0cfc43 commit 22d58e07e5dc54e113ae7414dea604549b0cfc43 Author: Kitware Robot AuthorDate: Thu May 23 00:01:09 2019 -0400 Commit: Kitware Robot CommitDate: Thu May 23 00:01:09 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e226579..6948abd 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 20190522) +set(CMake_VERSION_PATCH 20190523) #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-1058-g8ed6efb
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 8ed6efbbd377c0941ba018200282fc961aa7d20e (commit)
via fc4cbbc2a5f9f7d38e77c991a88400b29c39f182 (commit)
via c024e44abea66e37fefe358659d70d8811dd73c8 (commit)
via aefd424b6b2f5b630f9a511cfadd6b07228656c1 (commit)
via f83f29dbaa254053ac7fe2cc0e6403908fc04ac9 (commit)
via 9e07ea190bcbd83ffb054cff525fc1a0336a1a7d (commit)
via 021c61408cc042b1467fbee5cfac4a1ea509118f (commit)
via d0f0ba0f7a39e70fbed197e717292b74150cf84f (commit)
via a48ce8f4bf0677e9e8d054892836e8a980ffa435 (commit)
via 81b4d10d8f421242f9989ff0c2d37a12be66f405 (commit)
via 4c0fb923b7747f1eed0bfa73b8d1653997e1bda9 (commit)
via 26a99da206526efb203d0e448d7e095a07bec2fd (commit)
via 9c07cefee541d47be9c378a9285711e07be7a16f (commit)
via 639e14def6ada307c25a422a4b51f1fceaebeead (commit)
via c365243a3a282523062b5378898aa4fe6436f8fb (commit)
via 62381effba418cdccff0b18f234e3a307446d635 (commit)
via 3205c7c950d5b90d47ce1c5c58073e511339b78c (commit)
via 13c92b4a300934e9f8573dee01ab4ec5e06fa7a1 (commit)
via 083cf7e8a2515d9f838f3edbb2724fd3b17d83cd (commit)
from 01b6a2c4ee8930e60459b46b4d751148ce28d5a9 (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=8ed6efbbd377c0941ba018200282fc961aa7d20e
commit 8ed6efbbd377c0941ba018200282fc961aa7d20e
Merge: fc4cbbc d0f0ba0
Author: Brad King
AuthorDate: Wed May 22 14:30:43 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 10:32:43 2019 -0400
Merge topic 'default-generator-env'
d0f0ba0f7a Tests: Add environment generator tests
a48ce8f4bf Help: Add documentation for default generator environment
variables
083cf7e8a2 cmake: Allow default generator to be set by environment variables
Acked-by: Kitware Robot
Merge-request: !3218
diff --cc Source/cmake.cxx
index 031123a,c861f3b..0762ae1
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@@ -812,8 -840,18 +848,18 @@@ void cmake::SetArgs(const std::vectorSetDirectoriesFromFile(arg.c_str());
+ this->SetDirectoriesFromFile(arg);
}
+ // Empty instance, platform and toolset if only a generator is specified
+ if (this->GlobalGenerator) {
+ this->GeneratorInstance = "";
+ if (!this->GeneratorPlatformSet) {
+ this->GeneratorPlatform = "";
+ }
+ if (!this->GeneratorToolsetSet) {
+ this->GeneratorToolset = "";
+ }
+ }
}
const bool haveSourceDir = !this->GetHomeDirectory().empty();
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc4cbbc2a5f9f7d38e77c991a88400b29c39f182
commit fc4cbbc2a5f9f7d38e77c991a88400b29c39f182
Merge: c024e44 81b4d10
Author: Brad King
AuthorDate: Wed May 22 14:29:49 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 10:30:00 2019 -0400
Merge topic 'remove_unneeded_device_link_calls'
81b4d10d8f CUDA: More exhaustive checks to determine when to do device
linking
3205c7c950 cmNinjaLinkLineDeviceComputer now lives in the correct source
file
Acked-by: Kitware Robot
Merge-request: !3320
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c024e44abea66e37fefe358659d70d8811dd73c8
commit c024e44abea66e37fefe358659d70d8811dd73c8
Merge: aefd424 26a99da
Author: Brad King
AuthorDate: Wed May 22 14:28:42 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 10:28:59 2019 -0400
Merge topic 'find-package-prefer-config'
26a99da206 find_package: Add option to prefer Config mode
c365243a3a find_package: Factor out module and config find_package methods
Acked-by: Kitware Robot
Acked-by: Ruslan Baratov
Merge-request: !3339
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aefd424b6b2f5b630f9a511cfadd6b07228656c1
commit aefd424b6b2f5b630f9a511cfadd6b07228656c1
Merge: f83f29d 62381ef
Author: Brad King
AuthorDate: Wed May 22 14:27:19 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 10:28:00 2019 -0400
Merge topic 'swift-debug-variant'
62381effba Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE`
Acked-by: Kitware Robot
Merge-request: !3343
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f83f29dbaa254053ac7fe2cc0e6403908fc04ac9
commit f83f29dbaa254053ac7fe2cc0e6403908fc04ac9
Merge: 9e07ea1 9c07cef
Author: Brad King
AuthorDate: Wed May 22 14:25:50 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 10:27:01 2019 -0400
Merge topic 'vs-ApplicationTypeRevision'
9c07cefee5 VS: Fix
[Cmake-commits] CMake branch, master, updated. v3.14.4-1039-g01b6a2c
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 01b6a2c4ee8930e60459b46b4d751148ce28d5a9 (commit) via 974f4abbf8632bdd202ed5899f178d7c971b38fd (commit) via fffb5f1a75ee4d2c909209e68a822596606f90a4 (commit) via 6c81c6538b9ab53a8a8f378e1c35ec25c223200a (commit) from ad32282a3e6e7ca648f2e4a40410f08f95023df1 (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=01b6a2c4ee8930e60459b46b4d751148ce28d5a9 commit 01b6a2c4ee8930e60459b46b4d751148ce28d5a9 Merge: 974f4ab fffb5f1 Author: Brad King AuthorDate: Wed May 22 09:45:49 2019 -0400 Commit: Brad King CommitDate: Wed May 22 09:45:49 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=974f4abbf8632bdd202ed5899f178d7c971b38fd commit 974f4abbf8632bdd202ed5899f178d7c971b38fd Merge: ad32282 6c81c65 Author: Brad King AuthorDate: Wed May 22 13:44:20 2019 + Commit: Kitware Robot CommitDate: Wed May 22 09:44:28 2019 -0400 Merge topic 'libarchive-solaris-11.4' 6c81c6538b libarchive: avoid b64_encode name conflict with Solaris built-in function Acked-by: Kitware Robot Merge-request: !3351 --- Summary of changes: .../libarchive/archive_write_add_filter_b64encode.c| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.14.4-2-gfffb5f1
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 fffb5f1a75ee4d2c909209e68a822596606f90a4 (commit) via 6c81c6538b9ab53a8a8f378e1c35ec25c223200a (commit) from f872033d7531ed1d7d7345ff7873442ec8dbcee1 (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: .../libarchive/archive_write_add_filter_b64encode.c| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-1035-gad32282
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 ad32282a3e6e7ca648f2e4a40410f08f95023df1 (commit)
via a1eb03569d0e82fb6eaf9a11da1960cfa456f5ef (commit)
from f01e18eb4699df530e310d376e66752fa6c1dedf (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=ad32282a3e6e7ca648f2e4a40410f08f95023df1
commit ad32282a3e6e7ca648f2e4a40410f08f95023df1
Merge: f01e18e a1eb035
Author: Craig Scott
AuthorDate: Wed May 22 12:57:15 2019 +
Commit: Kitware Robot
CommitDate: Wed May 22 08:57:29 2019 -0400
Merge topic 'file-remove-no-empty'
a1eb03569d file: Change REMOVE to ignore empty names
Acked-by: Kitware Robot
Merge-request: !3349
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1eb03569d0e82fb6eaf9a11da1960cfa456f5ef
commit a1eb03569d0e82fb6eaf9a11da1960cfa456f5ef
Author: Brad King
AuthorDate: Tue May 21 09:20:01 2019 -0400
Commit: Brad King
CommitDate: Tue May 21 09:25:32 2019 -0400
file: Change REMOVE to ignore empty names
Previously code like
file(REMOVE_RECURSE "${accidentally_missing_variable}")
treated the empty string as a relative path with respect to the
current directory and removed its contents. Change this behavior
to ignore the empty string with a warning instead.
Normally such behavior changes are done with a policy, but in this case
such code is likely a real bug in project code that can delete data.
Fixes: #19274
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 0664e7c..f99021e 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -292,7 +292,8 @@ Move a file or directory within a filesystem from
to
Remove the given files. The ``REMOVE_RECURSE`` mode will remove the given
files and directories, also non-empty directories. No error is emitted if a
-given file does not exist.
+given file does not exist. Relative input paths are evaluated with respect
+to the current source directory. Empty input paths are ignored with a warning.
.. _MAKE_DIRECTORY:
diff --git a/Help/release/dev/file-remove-no-empty.rst
b/Help/release/dev/file-remove-no-empty.rst
new file mode 100644
index 000..0a68d67
--- /dev/null
+++ b/Help/release/dev/file-remove-no-empty.rst
@@ -0,0 +1,6 @@
+file-remove-no-empty
+
+
+* The :command:`file(REMOVE)` and :command:`file(REMOVE_RECURSE)` commands
+ were changed to ignore empty arguments with a warning instead of treating
+ them as a relative path and removing the contents of the current directory.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index f5ec9fe..1349910 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1405,6 +1405,12 @@ bool
cmFileCommand::HandleRemove(std::vector const& args,
cmMakeRange(args).advance(1)) // Get rid of subcommand
{
std::string fileName = arg;
+if (fileName.empty()) {
+ std::string const r = recurse ? "REMOVE_RECURSE" : "REMOVE";
+ this->Makefile->IssueMessage(MessageType::AUTHOR_WARNING,
+ "Ignoring empty file name in " + r + ".");
+ continue;
+}
if (!cmsys::SystemTools::FileIsFullPath(fileName)) {
fileName = this->Makefile->GetCurrentSourceDirectory();
fileName += "/" + arg;
diff --git a/Tests/RunCMake/file/REMOVE-empty-stderr.txt
b/Tests/RunCMake/file/REMOVE-empty-stderr.txt
new file mode 100644
index 000..898a6e1
--- /dev/null
+++ b/Tests/RunCMake/file/REMOVE-empty-stderr.txt
@@ -0,0 +1,11 @@
+^CMake Warning \(dev\) at REMOVE-empty.cmake:1 \(file\):
+ Ignoring empty file name in REMOVE.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9] \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
++
+CMake Warning \(dev\) at REMOVE-empty.cmake:2 \(file\):
+ Ignoring empty file name in REMOVE_RECURSE.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9] \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.$
diff --git a/Tests/RunCMake/file/REMOVE-empty.cmake
b/Tests/RunCMake/file/REMOVE-empty.cmake
new file mode 100644
index 000..38046fb
--- /dev/null
+++ b/Tests/RunCMake/file/REMOVE-empty.cmake
@@ -0,0 +1,2 @@
+file(REMOVE "")
+file(REMOVE_RECURSE "")
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake
b/Tests/RunCMake/file/RunCMakeTest.cmake
index 996d1c5..5db4b3b 100644
--- a/Tests/RunCMake/file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file/RunCMakeTest.cmake
@@ -43,6 +43,8 @@ run_cmake(GLOB_RECURSE-noexp-FOLLOW_SYMLINKS)
[Cmake-commits] CMake branch, master, updated. v3.14.4-1033-gf01e18e
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 f01e18eb4699df530e310d376e66752fa6c1dedf (commit) from 0bf53483295a4b7de358e8b85ad44866d89633c5 (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=f01e18eb4699df530e310d376e66752fa6c1dedf commit f01e18eb4699df530e310d376e66752fa6c1dedf Author: Kitware Robot AuthorDate: Wed May 22 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Wed May 22 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4303c25..e226579 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 20190521) +set(CMake_VERSION_PATCH 20190522) #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-1032-g0bf5348
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 0bf53483295a4b7de358e8b85ad44866d89633c5 (commit)
via 8538685c85f75d1904800999a50e12d3abb7484e (commit)
via 368bcba28a9cd4a9f75d6671cd391b8ceef8e973 (commit)
via 273257222ee6207dcb9ad290a08db5d6b7cc9db8 (commit)
from 389f795d2e68d287fcbba0d5e0e4678f3d90fe4c (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=0bf53483295a4b7de358e8b85ad44866d89633c5
commit 0bf53483295a4b7de358e8b85ad44866d89633c5
Merge: 8538685 2732572
Author: Brad King
AuthorDate: Tue May 21 13:46:36 2019 +
Commit: Kitware Robot
CommitDate: Tue May 21 09:46:45 2019 -0400
Merge topic 'string-param'
273257222e Source: change parameters to std::string
Acked-by: Kitware Robot
Merge-request: !3340
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8538685c85f75d1904800999a50e12d3abb7484e
commit 8538685c85f75d1904800999a50e12d3abb7484e
Merge: 389f795 368bcba
Author: Brad King
AuthorDate: Tue May 21 13:44:09 2019 +
Commit: Kitware Robot
CommitDate: Tue May 21 09:44:19 2019 -0400
Merge topic 'FindPostgreSQL-config-support'
368bcba28a FindPostgreSQL: Find debug lib, imported configs
Acked-by: Kitware Robot
Merge-request: !3298
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=368bcba28a9cd4a9f75d6671cd391b8ceef8e973
commit 368bcba28a9cd4a9f75d6671cd391b8ceef8e973
Author: Andrei Lebedev
AuthorDate: Thu May 9 20:17:28 2019 +0300
Commit: Brad King
CommitDate: Mon May 20 11:29:04 2019 -0400
FindPostgreSQL: Find debug lib, imported configs
* Add find_library calls for debug and release
* Set imported configs for corresponding libraries in imported target
* Set debug/optimized in PostgreSQL_LIBRARIES
Signed-off-by: Andrei Lebedev
diff --git a/Help/release/dev/FindPostgreSQL-config-support.rst
b/Help/release/dev/FindPostgreSQL-config-support.rst
new file mode 100644
index 000..f24dc68
--- /dev/null
+++ b/Help/release/dev/FindPostgreSQL-config-support.rst
@@ -0,0 +1,5 @@
+FindPostgreSQL-config-support
+-
+
+* The :module:`FindPostgreSQL` module learned to find debug and release
+ variants separately.
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 4b5e60e..433eae7 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -155,16 +155,30 @@ if ( WIN32 )
set (PostgreSQL_LIBRARY_TO_FIND
${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
endif()
-find_library(PostgreSQL_LIBRARY
- NAMES ${PostgreSQL_LIBRARY_TO_FIND}
- PATHS
- ${PostgreSQL_ROOT_DIRECTORIES}
- PATH_SUFFIXES
- lib
- ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
- # Help the user find it if we cannot.
- DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}"
-)
+function(__postgresql_find_library _name)
+ find_library(${_name}
+ NAMES ${ARGN}
+ PATHS
+ ${PostgreSQL_ROOT_DIRECTORIES}
+ PATH_SUFFIXES
+ lib
+ ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
+ # Help the user find it if we cannot.
+ DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}"
+ )
+endfunction()
+
+# For compatibility with versions prior to this multi-config search, honor
+# any PostgreSQL_LIBRARY that is already specified and skip the search.
+if(PostgreSQL_LIBRARY)
+ set(PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARY}")
+else()
+ __postgresql_find_library(PostgreSQL_LIBRARY_RELEASE
${PostgreSQL_LIBRARY_TO_FIND})
+ __postgresql_find_library(PostgreSQL_LIBRARY_DEBUG
${PostgreSQL_LIBRARY_TO_FIND}d)
+ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+ select_library_configurations(PostgreSQL)
+ mark_as_advanced(PostgreSQL_LIBRARY_RELEASE PostgreSQL_LIBRARY_DEBUG)
+endif()
get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
if (PostgreSQL_INCLUDE_DIR)
@@ -213,17 +227,36 @@ find_package_handle_standard_args(PostgreSQL
VERSION_VAR PostgreSQL_VERSION_STRING)
set(PostgreSQL_FOUND ${POSTGRESQL_FOUND})
+function(__postgresql_import_library _target _var _config)
+ if(_config)
+set(_config_suffix "_${_config}")
+ else()
+set(_config_suffix "")
+ endif()
+
+ set(_lib "${${_var}${_config_suffix}}")
+ if(EXISTS "${_lib}")
+if(_config)
+ set_property(TARGET ${_target} APPEND PROPERTY
+IMPORTED_CONFIGURATIONS ${_config})
+endif()
+set_target_properties(${_target} PROPERTIES
+ IMPORTED_LOCATION${_config_suffix} "${_lib}")
+ endif()
+endfunction()
+
# Now try to get the include and library path.
[Cmake-commits] CMake branch, master, updated. v3.14.4-1028-g389f795
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 389f795d2e68d287fcbba0d5e0e4678f3d90fe4c (commit) via a59662bb5ba571907baf9d6d6ed4ea9dd025e706 (commit) from 1db0edb2a65b272a7c91e719e818da2e2ce49fb5 (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=389f795d2e68d287fcbba0d5e0e4678f3d90fe4c commit 389f795d2e68d287fcbba0d5e0e4678f3d90fe4c Merge: 1db0edb a59662b Author: Brad King AuthorDate: Tue May 21 13:39:52 2019 + Commit: Kitware Robot CommitDate: Tue May 21 09:40:03 2019 -0400 Merge topic 'doc-ipo-check' a59662bb5b Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATION Acked-by: Kitware Robot Merge-request: ! https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a59662bb5ba571907baf9d6d6ed4ea9dd025e706 commit a59662bb5ba571907baf9d6d6ed4ea9dd025e706 Author: Ruslan Baratov AuthorDate: Thu May 16 23:00:19 2019 +0300 Commit: Ruslan Baratov CommitDate: Fri May 17 20:46:00 2019 +0300 Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATION diff --git a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst index 3f68c31..d3a5e94 100644 --- a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst +++ b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst @@ -4,7 +4,9 @@ INTERPROCEDURAL_OPTIMIZATION Enable interprocedural optimization for a target. If set to true, enables interprocedural optimizations if they are -known to be supported by the compiler. +known :module:`to be supported ` by the compiler. Depending +on value of policy :policy:`CMP0069`, the error will be reported or ignored, +if interprocedural optimization is enabled but not supported. This property is initialized by the :variable:`CMAKE_INTERPROCEDURAL_OPTIMIZATION` variable if it is set when a --- Summary of changes: Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-1026-g1db0edb
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 1db0edb2a65b272a7c91e719e818da2e2ce49fb5 (commit) from e025495b8500f9aaf6745571ffdb48a6218e7929 (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=1db0edb2a65b272a7c91e719e818da2e2ce49fb5 commit 1db0edb2a65b272a7c91e719e818da2e2ce49fb5 Author: Kitware Robot AuthorDate: Tue May 21 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Tue May 21 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 63d5f3d..4303c25 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 20190520) +set(CMake_VERSION_PATCH 20190521) #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-1025-ge025495
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 e025495b8500f9aaf6745571ffdb48a6218e7929 (commit)
via a9fb9a8774a7b1dd411542d1d14fb537968e32f1 (commit)
via f945c3e755469457bd1c89fe7c9153521005f43f (commit)
via 1ded3599d698c1bfa0243d58ece8b619d2900a17 (commit)
via 827da1119ef2d0978dd6dbc58aeee803e43b2455 (commit)
via adc3459707c4c942b547eb57d02a82b8d5085962 (commit)
via 0d41b45cc931530d5dbc51674699f4da2290a6d3 (commit)
via a9180ccf9a9e845658ba455e2dbc2447b18d2654 (commit)
via d745551fb6311f5db6e8133df63a7fc410e8a68b (commit)
via 9a182c9e5b36ba68fc91b53e3d755c263ee3d0ef (commit)
via e9b0063e8e0f2fcb5cc4239a06deec17c49688c4 (commit)
via b6412e3e38ba22bf816445f19394e7c8027c186f (commit)
via 7d7f31161d65d8b1f460eaf23e1b092bdaf7c238 (commit)
via d688c4c19d0ec6d639ba7047e786bdacb7a4b45b (commit)
via 0723582208dda7da9815a319973eed596c61a44c (commit)
via 086c51dc045c75662500b39da3341af83281d6df (commit)
from 28ee31149030c75c32ebbf134502a9d020dbd54b (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=e025495b8500f9aaf6745571ffdb48a6218e7929
commit e025495b8500f9aaf6745571ffdb48a6218e7929
Merge: a9fb9a8 f945c3e
Author: Brad King
AuthorDate: Mon May 20 14:55:53 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:56:22 2019 -0400
Merge topic 'makefiles_additional_clean_files'
f945c3e755 Tests: Extend MakeClean test to cover subdirectories without
targets
1ded3599d6 Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory
level
827da1119e Makefiles: Make build root targets "all", "clean" and
"preinstall" recursive
adc3459707 Makefiles: Avoid pointer repurposing
0d41b45cc9 Makefiles: Inline range loop range arguments
Acked-by: Kitware Robot
Merge-request: !3338
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9fb9a8774a7b1dd411542d1d14fb537968e32f1
commit a9fb9a8774a7b1dd411542d1d14fb537968e32f1
Merge: 28ee311 a9180cc
Author: Brad King
AuthorDate: Mon May 20 14:55:11 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:55:27 2019 -0400
Merge topic 'ninja-swift'
a9180ccf9a Tests: add a check for the Swift compiler
d745551fb6 Help: add some initial documentation for Swift support
9a182c9e5b Auxiliary: update vim syntax highlighting
e9b0063e8e Modules: add build rules for Swift Ninja support
b6412e3e38 Ninja: add placeholders to support Swift build
7d7f31161d Ninja: add support for Swift's output-file-map.json
d688c4c19d Swift: remove unnecessary unreleased Ninja infrastructure
0723582208 Swift: Detect compiler version
...
Acked-by: Kitware Robot
Merge-request: !3297
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f945c3e755469457bd1c89fe7c9153521005f43f
commit f945c3e755469457bd1c89fe7c9153521005f43f
Author: Sebastian Holtermann
AuthorDate: Fri May 17 10:30:34 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Sat May 18 12:27:29 2019 +0200
Tests: Extend MakeClean test to cover subdirectories without targets
This adds a subdirectory to the MakeClean test, in which files are added to
the `ADDITIONAL_CLEAN_FILES` directory property, but which holds no targets.
diff --git a/Tests/MakeClean/ToClean/CMakeLists.txt
b/Tests/MakeClean/ToClean/CMakeLists.txt
index 5d84e6c..6f16d12 100644
--- a/Tests/MakeClean/ToClean/CMakeLists.txt
+++ b/Tests/MakeClean/ToClean/CMakeLists.txt
@@ -2,45 +2,56 @@ cmake_minimum_required(VERSION 3.14)
project(ToClean)
# Utility variables
-set(TSD ${ToClean_SOURCE_DIR})
-set(TBD ${ToClean_BINARY_DIR})
+set(CSD ${CMAKE_CURRENT_SOURCE_DIR})
+set(CBD ${CMAKE_CURRENT_BINARY_DIR})
set(CLEAN_FILE_CONTENT "File registered for cleaning.\n")
# Lists build-time-generated files that should be cleaned away
-set(TOCLEAN_FILES)
+set_property(GLOBAL PROPERTY TOCLEAN_FILES "")
+function(addCleanFile FILENAME)
+ set_property(GLOBAL APPEND PROPERTY TOCLEAN_FILES "${FILENAME}")
+endfunction()
+function(writeCleanFile FILENAME)
+ file(WRITE "${FILENAME}" ${CLEAN_FILE_CONTENT})
+endfunction()
# Build a simple project whose compiled objects should be cleaned.
add_executable(toclean toclean.cxx)
-list(APPEND TOCLEAN_FILES
-
"${TBD}${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
+# to a custom
[Cmake-commits] CMake branch, master, updated. v3.14.4-1009-g28ee311
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 28ee31149030c75c32ebbf134502a9d020dbd54b (commit)
via 21c74faa1ad75aa52d465467908edcb888cb53bf (commit)
from 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab (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=28ee31149030c75c32ebbf134502a9d020dbd54b
commit 28ee31149030c75c32ebbf134502a9d020dbd54b
Merge: 9860b4c 21c74fa
Author: Brad King
AuthorDate: Mon May 20 14:03:48 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:04:00 2019 -0400
Merge topic 'FindPNG-static-define'
21c74faa1a FindPNG: Fix definitions on imported target
Acked-by: Kitware Robot
Acked-by: Paolo Lammens
Merge-request: !3337
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21c74faa1ad75aa52d465467908edcb888cb53bf
commit 21c74faa1ad75aa52d465467908edcb888cb53bf
Author: Axel Huebl
AuthorDate: Fri May 17 17:08:37 2019 +0200
Commit: Brad King
CommitDate: Fri May 17 12:07:18 2019 -0400
FindPNG: Fix definitions on imported target
The `INTERFACE_COMPILE_DEFINITIONS` property should not have ``-D``
in its value.
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 2208b48..a7908c5 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -100,13 +100,14 @@ if(ZLIB_FOUND)
# No need to define PNG_USE_DLL here, because it's default for
Cygwin.
else()
set (PNG_DEFINITIONS -DPNG_STATIC)
+ set(_PNG_COMPILE_DEFINITIONS PNG_STATIC)
endif()
endif ()
if(NOT TARGET PNG::PNG)
add_library(PNG::PNG UNKNOWN IMPORTED)
set_target_properties(PNG::PNG PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+ INTERFACE_COMPILE_DEFINITIONS "${_PNG_COMPILE_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
if(EXISTS "${PNG_LIBRARY}")
@@ -129,6 +130,8 @@ if(ZLIB_FOUND)
IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
endif()
endif()
+
+ unset(_PNG_COMPILE_DEFINITIONS)
endif ()
if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
---
Summary of changes:
Modules/FindPNG.cmake | 5 -
1 file changed, 4 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.14.4-1007-g9860b4c
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 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab (commit)
via 73a829e0785a497069f55d8b2be2fb7b859a3e20 (commit)
from 96cf96d4ebd27a1cc725c938899a23a2ddd25334 (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=9860b4c5e8756cb58c4cdfc27a14194f823aa0ab
commit 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab
Merge: 96cf96d 73a829e
Author: Brad King
AuthorDate: Mon May 20 14:02:45 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:02:57 2019 -0400
Merge topic 'interface-library-export-properties'
73a829e078 InterfaceLibrary: Whitelist EXPORT_PROPERTIES property
Acked-by: Kitware Robot
Merge-request: !3336
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73a829e0785a497069f55d8b2be2fb7b859a3e20
commit 73a829e0785a497069f55d8b2be2fb7b859a3e20
Author: Brad King
AuthorDate: Fri May 17 09:14:45 2019 -0400
Commit: Brad King
CommitDate: Fri May 17 09:20:04 2019 -0400
InterfaceLibrary: Whitelist EXPORT_PROPERTIES property
Fixes: #19261
diff --git a/Help/manual/cmake-buildsystem.7.rst
b/Help/manual/cmake-buildsystem.7.rst
index 1ad3453..8cd6e68 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -977,6 +977,7 @@ are:
* Properties matching ``INTERFACE_*``
* Built-in properties matching ``COMPATIBLE_INTERFACE_*``
* ``EXPORT_NAME``
+* ``EXPORT_PROPERTIES``
* ``IMPORTED``
* ``MANUALLY_ADDED_DEPENDENCIES``
* ``NAME``
diff --git a/Source/cmTargetPropertyComputer.cxx
b/Source/cmTargetPropertyComputer.cxx
index 994fcf7..3f763af 100644
--- a/Source/cmTargetPropertyComputer.cxx
+++ b/Source/cmTargetPropertyComputer.cxx
@@ -63,6 +63,7 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
builtIns.insert("COMPATIBLE_INTERFACE_NUMBER_MIN");
builtIns.insert("COMPATIBLE_INTERFACE_STRING");
builtIns.insert("EXPORT_NAME");
+builtIns.insert("EXPORT_PROPERTIES");
builtIns.insert("IMPORTED");
builtIns.insert("IMPORTED_GLOBAL");
builtIns.insert("MANUALLY_ADDED_DEPENDENCIES");
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt
b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index fd55c42..22a4ef6 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -41,6 +41,8 @@ install(FILES
add_library(cmakeonly INTERFACE)
set_property(TARGET cmakeonly PROPERTY INTERFACE_COMPILE_DEFINITIONS
[[DEF="\"\$\B"]])
+set_property(TARGET cmakeonly PROPERTY custom_property CustomPropertyValue)
+set_property(TARGET cmakeonly PROPERTY EXPORT_PROPERTIES custom_property)
install(TARGETS headeronly sharediface use_auto_type use_c_restrict
source_target
cmakeonly
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt
b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index c850508..a07a5b3 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -109,4 +109,12 @@ foreach(ns exp bld)
"not\n"
" " [[DEF="\"\$\B"]] "\n")
endif()
+ get_property(custom TARGET ${ns}::cmakeonly PROPERTY custom_property)
+ if(NOT custom STREQUAL "CustomPropertyValue")
+message(SEND_ERROR
+ "${ns}::cmakeonly property custom_property is:\n"
+ " ${custom}\n"
+ "not\n"
+ " CustomPropertyValue\n")
+ endif()
endforeach()
---
Summary of changes:
Help/manual/cmake-buildsystem.7.rst| 1 +
Source/cmTargetPropertyComputer.cxx| 1 +
Tests/ExportImport/Export/Interface/CMakeLists.txt | 2 ++
Tests/ExportImport/Import/Interface/CMakeLists.txt | 8
4 files changed, 12 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.4-1005-g96cf96d
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 96cf96d4ebd27a1cc725c938899a23a2ddd25334 (commit) from 7024fe33b8ea1d1fba3bf881f8c530688107c505 (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=96cf96d4ebd27a1cc725c938899a23a2ddd25334 commit 96cf96d4ebd27a1cc725c938899a23a2ddd25334 Author: Kitware Robot AuthorDate: Mon May 20 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Mon May 20 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a5dd3e6..63d5f3d 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 20190519) +set(CMake_VERSION_PATCH 20190520) #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-1004-g7024fe3
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 7024fe33b8ea1d1fba3bf881f8c530688107c505 (commit) from dec5693641f794901851eafe24aed6a9338ad786 (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=7024fe33b8ea1d1fba3bf881f8c530688107c505 commit 7024fe33b8ea1d1fba3bf881f8c530688107c505 Author: Kitware Robot AuthorDate: Sun May 19 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Sun May 19 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 459f728..a5dd3e6 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 20190518) +set(CMake_VERSION_PATCH 20190519) #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-1003-gdec5693
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 dec5693641f794901851eafe24aed6a9338ad786 (commit)
via 124564504a4f3d8416899de96e0dec048c588372 (commit)
from 3bd8ed22e8017e5490b8e758f486433b005ace30 (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=dec5693641f794901851eafe24aed6a9338ad786
commit dec5693641f794901851eafe24aed6a9338ad786
Merge: 3bd8ed2 1245645
Author: Craig Scott
AuthorDate: Sat May 18 23:24:42 2019 +
Commit: Kitware Robot
CommitDate: Sat May 18 19:24:55 2019 -0400
Merge topic 'bracket-comment-doc-clarification'
124564504a Help: Clarify that bracket comments start with bracket open
Acked-by: Kitware Robot
Acked-by: Brad King
Acked-by: Ben McMorran
Merge-request: !3331
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=124564504a4f3d8416899de96e0dec048c588372
commit 124564504a4f3d8416899de96e0dec048c588372
Author: Kyle Edwards
AuthorDate: Thu May 16 14:37:00 2019 -0400
Commit: Kyle Edwards
CommitDate: Thu May 16 17:55:38 2019 -0400
Help: Clarify that bracket comments start with bracket open
Fixes: #19264
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 5e5cfff..4ca8e3a 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -430,7 +430,7 @@ comments: a `Bracket Comment`_ and a `Line Comment`_.
Bracket Comment
^^^
-A ``#`` immediately followed by a `Bracket Argument`_ forms a
+A ``#`` immediately followed by a :token:`bracket_open` forms a
*bracket comment* consisting of the entire bracket enclosure:
.. raw:: latex
@@ -461,7 +461,7 @@ For example:
Line Comment
-A ``#`` not immediately followed by a `Bracket Argument`_ forms a
+A ``#`` not immediately followed by a :token:`bracket_open` forms a
*line comment* that runs until the end of the line:
.. raw:: latex
@@ -469,7 +469,7 @@ A ``#`` not immediately followed by a `Bracket Argument`_
forms a
\begin{small}
.. productionlist::
- line_comment: '#'
.. raw:: latex
---
Summary of changes:
Help/manual/cmake-language.7.rst | 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.14.4-1001-g3bd8ed2
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 3bd8ed22e8017e5490b8e758f486433b005ace30 (commit)
via e3ff7ced630808e2e74f0853a720bc90d3f35abb (commit)
from 8ada05980f1a12a2673f78f4ea7bab9df6b9d987 (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=3bd8ed22e8017e5490b8e758f486433b005ace30
commit 3bd8ed22e8017e5490b8e758f486433b005ace30
Merge: 8ada059 e3ff7ce
Author: Marc Chevrier
AuthorDate: Sat May 18 08:25:16 2019 +
Commit: Kitware Robot
CommitDate: Sat May 18 04:25:39 2019 -0400
Merge topic 'file-install-follow-symlink-chain'
e3ff7ced63 file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argument
Acked-by: Kitware Robot
Acked-by: Brad King
Merge-request: !3332
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3ff7ced630808e2e74f0853a720bc90d3f35abb
commit e3ff7ced630808e2e74f0853a720bc90d3f35abb
Author: Kyle Edwards
AuthorDate: Thu May 16 15:23:14 2019 -0400
Commit: Kyle Edwards
CommitDate: Thu May 16 15:25:33 2019 -0400
file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argument
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 465e567..0664e7c 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -311,6 +311,7 @@ Create the given directories and their parents as needed.
[FILE_PERMISSIONS ...]
[DIRECTORY_PERMISSIONS ...]
[NO_SOURCE_PERMISSIONS] [USE_SOURCE_PERMISSIONS]
+ [FOLLOW_SYMLINK_CHAIN]
[FILES_MATCHING]
[[PATTERN | REGEX ]
[EXCLUDE] [PERMISSIONS ...]] [...])
@@ -324,6 +325,32 @@ at the destination with the same timestamp. Copying
preserves input
permissions unless explicit permissions or ``NO_SOURCE_PERMISSIONS``
are given (default is ``USE_SOURCE_PERMISSIONS``).
+If ``FOLLOW_SYMLINK_CHAIN`` is specified, ``COPY`` will recursively resolve
+the symlinks at the paths given until a real file is found, and install
+a corresponding symlink in the destination for each symlink encountered. For
+each symlink that is installed, the resolution is stripped of the directory,
+leaving only the filename, meaning that the new symlink points to a file in
+the same directory as the symlink. This feature is useful on some Unix systems,
+where libraries are installed as a chain of symlinks with version numbers, with
+less specific versions pointing to more specific versions.
+``FOLLOW_SYMLINK_CHAIN`` will install all of these symlinks and the library
+itself into the destination directory. For example, if you have the following
+directory structure:
+
+* ``/opt/foo/lib/libfoo.so.1.2.3``
+* ``/opt/foo/lib/libfoo.so.1.2 -> libfoo.so.1.2.3``
+* ``/opt/foo/lib/libfoo.so.1 -> libfoo.so.1.2``
+* ``/opt/foo/lib/libfoo.so -> libfoo.so.1``
+
+and you do:
+
+.. code-block:: cmake
+
+ file(COPY /opt/foo/lib/libfoo.so DESTINATION lib FOLLOW_SYMLINK_CHAIN)
+
+This will install all of the symlinks and ``libfoo.so.1.2.3`` itself into
+``lib``.
+
See the :command:`install(DIRECTORY)` command for documentation of
permissions, ``FILES_MATCHING``, ``PATTERN``, ``REGEX``, and
``EXCLUDE`` options. Copying directories preserves the structure
diff --git a/Help/release/dev/file-install-follow-symlink-chain.rst
b/Help/release/dev/file-install-follow-symlink-chain.rst
new file mode 100644
index 000..8d22512
--- /dev/null
+++ b/Help/release/dev/file-install-follow-symlink-chain.rst
@@ -0,0 +1,6 @@
+file-install-follow-symlink-chain
+-
+
+* The :command:`file(INSTALL)` command learned a new argument,
+ ``FOLLOW_SYMLINK_CHAIN``, which can be used to recursively resolve and
+ install symlinks.
diff --git a/Source/cmFileCopier.cxx b/Source/cmFileCopier.cxx
index 8913e6d..972cd6e 100644
--- a/Source/cmFileCopier.cxx
+++ b/Source/cmFileCopier.cxx
@@ -31,6 +31,7 @@ cmFileCopier::cmFileCopier(cmFileCommand* command, const
char* name)
, UseGivenPermissionsFile(false)
, UseGivenPermissionsDir(false)
, UseSourcePermissions(true)
+ , FollowSymlinkChain(false)
, Doing(DoingNone)
{
}
@@ -249,6 +250,9 @@ bool cmFileCopier::CheckKeyword(std::string const& arg)
this->Doing = DoingPattern;
} else if (arg == "REGEX") {
this->Doing = DoingRegex;
+ } else if (arg == "FOLLOW_SYMLINK_CHAIN") {
+this->FollowSymlinkChain = true;
+this->Doing = DoingNone;
} else if (arg == "EXCLUDE") {
// Add this property to the current match rule.
if (this->CurrentMatchRule) {
@@ -464,16 +468,69 @@ bool cmFileCopier::Install(const std::string& fromFile,
if (cmSystemTools::SameFile(fromFile, toFile)) {
return true;
}
- if
[Cmake-commits] CMake branch, master, updated. v3.14.4-999-g8ada059
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 8ada05980f1a12a2673f78f4ea7bab9df6b9d987 (commit) from 94b2c757725b86a38b7934f9e1084debe6dbe2de (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=8ada05980f1a12a2673f78f4ea7bab9df6b9d987 commit 8ada05980f1a12a2673f78f4ea7bab9df6b9d987 Author: Kitware Robot AuthorDate: Sat May 18 00:01:11 2019 -0400 Commit: Kitware Robot CommitDate: Sat May 18 00:01:11 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index dc4f5fd..459f728 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 20190517) +set(CMake_VERSION_PATCH 20190518) #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-998-g94b2c75
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 94b2c757725b86a38b7934f9e1084debe6dbe2de (commit)
via e1c95bc2788c0c71418a303306a66ff5bad7c938 (commit)
via 21f5ed80918507dc3a9dcd0b617ded901d6db74e (commit)
via 89ab54c11239f4832668ecca6a0b0b9edf112bd8 (commit)
via eda3963615e64f180e452b6e4bd1cce7f9fb14a9 (commit)
via 8c47be28cc2e5d45c53a089b681257c0b8387964 (commit)
via ac86c02d1b6da921c93d53fed85ad70ab05c4608 (commit)
via 2532e00339d34e36e90f78a28c3e4ce882f6fac0 (commit)
via 4edc0ef359578ddaa7db0163e3a6097e12530c9b (commit)
via 93ee7dd044dcebe99531169a0cfd96b3b0c5a2ef (commit)
via 4b4fd99f41e4178d914c41883ee12b63e9cb145a (commit)
from acc2f022bb538cbd61621f66d64d13b751d23f39 (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=94b2c757725b86a38b7934f9e1084debe6dbe2de
commit 94b2c757725b86a38b7934f9e1084debe6dbe2de
Merge: e1c95bc 89ab54c
Author: Brad King
AuthorDate: Fri May 17 13:38:50 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:39:48 2019 -0400
Merge topic 'findblas_mklroot_bla_vendor'
89ab54c112 FindBLAS: Choose MKL arch based on BLA_VENDOR
Acked-by: Kitware Robot
Merge-request: !3330
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1c95bc2788c0c71418a303306a66ff5bad7c938
commit e1c95bc2788c0c71418a303306a66ff5bad7c938
Merge: 21f5ed8 93ee7dd
Author: Brad King
AuthorDate: Fri May 17 13:37:35 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:38:44 2019 -0400
Merge topic 'autogen_ninja_clean'
93ee7dd044 Autogen: Update documentation for ADDITIONAL_CLEAN_FILES
4b4fd99f41 Autogen: Use ADDITIONAL_CLEAN_FILES target property for file
cleaning
Acked-by: Kitware Robot
Merge-request: !3327
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21f5ed80918507dc3a9dcd0b617ded901d6db74e
commit 21f5ed80918507dc3a9dcd0b617ded901d6db74e
Merge: acc2f02 eda3963
Author: Brad King
AuthorDate: Fri May 17 13:37:22 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:37:33 2019 -0400
Merge topic 'use_additional_clean_files'
eda3963615 UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaning
8c47be28cc UseJava: Use ADDITIONAL_CLEAN_FILES for cleaning
ac86c02d1b UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaning
2532e00339 FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaning
4edc0ef359 Test: Improve WarnUnusedCliUnused to run on all generators
Acked-by: Kitware Robot
Merge-request: !3328
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ab54c11239f4832668ecca6a0b0b9edf112bd8
commit 89ab54c11239f4832668ecca6a0b0b9edf112bd8
Author: Jakub Benda
AuthorDate: Thu May 16 09:00:21 2019 +0100
Commit: Jakub Benda
CommitDate: Thu May 16 10:35:37 2019 +0100
FindBLAS: Choose MKL arch based on BLA_VENDOR
Recently, FindBLAS has been extended with additional library search
path based on the environment variable MKLROOT. However, the choice
of the Intel MKL architecture (IA-32 vs Intel64) was based on
unrelated (and possibly undefined) size of integer.
This commit changes the selection of the Intel MKL architecture to
instead consider the variable BLA_VENDOR, if available.
So, if the environment variable MKLROOT is defined and
BLA_VENDOR=Intel10_32, then $ENV{MKLROOT}/lib/ia32_ will be added
to the search path (OS = lin, win, or mac).
Similarly, if MKLROOT is defined and BLA_VENDOR=Intel10_64lp or
BLA_VENDOR=Intel10_64ilp, then the path $ENV{MKLROOT}/intel64_
will be used.
If either MKLROOT or BLA_VENDOR is undefined, no additional search
path on top of LD_LIBRARY_PATH / DYLD_LIBRARY_PATH / LIB is be added.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 8d55ac7..65e5d1c 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -403,20 +403,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
endif ()
if (DEFINED ENV{MKLROOT})
-set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}")
+if (BLA_VENDOR STREQUAL "Intel10_32")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/ia32")
+elseif (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR MATCHES
"^Intel10_64i?lp_seq$")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/intel64")
+endif ()
endif ()
if (_BLAS_MKLROOT_LIB_DIR)
-if( SIZEOF_INTEGER EQUAL 8 )
- set( _BLAS_MKL_PATH_PREFIX "intel64" )
-else()
- set(
[Cmake-commits] CMake branch, master, updated. v3.14.4-987-gacc2f02
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 acc2f022bb538cbd61621f66d64d13b751d23f39 (commit)
via 3020354f7c86f959d707aed2b833692204dd7778 (commit)
via 23e8364aedcbeb7ce606b6075c98827e52f0c7f6 (commit)
via e214abdaab4f8097095a601067b4071194ad01a5 (commit)
via f84ed796a220c6a4879f08e9003fe5489d8d104d (commit)
from 736f9d184da2109b009078e3184e996883bd7554 (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=acc2f022bb538cbd61621f66d64d13b751d23f39
commit acc2f022bb538cbd61621f66d64d13b751d23f39
Merge: 3020354 e214abd
Author: Brad King
AuthorDate: Fri May 17 13:26:38 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:27:12 2019 -0400
Merge topic 'offer_compiler_lang_generator_expression'
e214abdaab Genex: Add COMPILE_LANG_AND_ID generator expression
f84ed796a2 Docs: Generator-expressions remove usage of `CMake-id`
Acked-by: Kitware Robot
Merge-request: !3300
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3020354f7c86f959d707aed2b833692204dd7778
commit 3020354f7c86f959d707aed2b833692204dd7778
Merge: 736f9d1 23e8364
Author: Brad King
AuthorDate: Fri May 17 13:25:56 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:26:05 2019 -0400
Merge topic 'string-cleanup'
23e8364aed Source: std::string related cleanup
Acked-by: Kitware Robot
Acked-by: Sebastian Holtermann
Merge-request: !3324
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23e8364aedcbeb7ce606b6075c98827e52f0c7f6
commit 23e8364aedcbeb7ce606b6075c98827e52f0c7f6
Author: Vitaly Stakhovsky
AuthorDate: Tue May 14 09:16:11 2019 -0400
Commit: Brad King
CommitDate: Wed May 15 10:20:05 2019 -0400
Source: std::string related cleanup
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 2f62db1..f12ef0b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -122,8 +122,8 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
}
}
- const char* sourceDirectory = argv[2].c_str();
- const char* projectName = nullptr;
+ std::string sourceDirectory = argv[2];
+ std::string projectName;
std::string targetName;
std::vector cmakeFlags(1, "CMAKE_FLAGS"); // fake argv[0]
std::vector compileDefs;
@@ -309,7 +309,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
doing = DoingNone;
} else if (i == 3) {
this->SrcFileSignature = false;
- projectName = argv[i].c_str();
+ projectName = argv[i];
} else if (i == 4 && !this->SrcFileSignature) {
targetName = argv[i];
} else {
@@ -480,7 +480,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
// we need to create a directory and CMakeLists file etc...
// first create the directories
-sourceDirectory = this->BinaryDirectory.c_str();
+sourceDirectory = this->BinaryDirectory;
// now create a CMakeLists.txt file in that directory
FILE* fout = cmsys::SystemTools::Fopen(outFileName, "w");
@@ -950,7 +950,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
<< " '" << copyFile << "'\n";
/* clang-format on */
if (!this->FindErrorMessage.empty()) {
- emsg << this->FindErrorMessage.c_str();
+ emsg << this->FindErrorMessage;
}
if (copyFileError.empty()) {
this->Makefile->IssueMessage(MessageType::FATAL_ERROR, emsg.str());
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index 93ff8f4..c6e44e3 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -280,8 +280,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
xml.StartElement("Build");
- this->AppendTarget(xml, "all", nullptr, make.c_str(), lgs[0],
- compiler.c_str(), makeArgs);
+ this->AppendTarget(xml, "all", nullptr, make, lgs[0], compiler, makeArgs);
// add all executable and library targets and some of the GLOBAL
// and UTILITY targets
@@ -294,8 +293,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
// Only add the global targets from CMAKE_BINARY_DIR,
// not from the subdirs
if (lg->GetCurrentBinaryDirectory() == lg->GetBinaryDirectory()) {
-this->AppendTarget(xml, targetName, nullptr, make.c_str(), lg,
- compiler.c_str(), makeArgs);
+this->AppendTarget(xml, targetName, nullptr, make, lg, compiler,
+
[Cmake-commits] CMake branch, master, updated. v3.14.4-982-g736f9d1
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 736f9d184da2109b009078e3184e996883bd7554 (commit) from 64a7f491ef8ab6f70a77f89c91d1e7e9d549333e (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=736f9d184da2109b009078e3184e996883bd7554 commit 736f9d184da2109b009078e3184e996883bd7554 Author: Kitware Robot AuthorDate: Fri May 17 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 17 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8c3fa94..dc4f5fd 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 20190516) +set(CMake_VERSION_PATCH 20190517) #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-981-g64a7f49
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 64a7f491ef8ab6f70a77f89c91d1e7e9d549333e (commit)
via 7b0abaac318b080d9d9044a2665541b840087c89 (commit)
from 92b7a8fa2976208e3f7e5f1c5db422982b0dc1d4 (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=64a7f491ef8ab6f70a77f89c91d1e7e9d549333e
commit 64a7f491ef8ab6f70a77f89c91d1e7e9d549333e
Merge: 92b7a8f 7b0abaa
Author: Brad King
AuthorDate: Thu May 16 14:27:19 2019 +
Commit: Kitware Robot
CommitDate: Thu May 16 10:27:44 2019 -0400
Merge topic 'armclang'
7b0abaac31 ARMClang: Add support for Clang-based ARM compiler
Acked-by: Kitware Robot
Merge-request: !3315
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b0abaac318b080d9d9044a2665541b840087c89
commit 7b0abaac318b080d9d9044a2665541b840087c89
Author: Johan Stridkvist
AuthorDate: Mon May 13 15:05:47 2019 +0200
Commit: Brad King
CommitDate: Tue May 14 14:59:55 2019 -0400
ARMClang: Add support for Clang-based ARM compiler
Fixes: #18215
diff --git a/Help/release/dev/armclang.rst b/Help/release/dev/armclang.rst
new file mode 100644
index 000..da82032
--- /dev/null
+++ b/Help/release/dev/armclang.rst
@@ -0,0 +1,4 @@
+armclang
+
+
+* Support for the Clang-based ARM compiler was added with compiler id
``ARMClang``.
diff --git a/Help/variable/CMAKE_LANG_COMPILER_ID.rst
b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
index 2bb39798..16d97ee 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_ID.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
@@ -12,6 +12,7 @@ include:
ADSP = Analog VisualDSP++ (analog.com)
AppleClang = Apple Clang (apple.com)
ARMCC = ARM Compiler (arm.com)
+ ARMClang = ARM Compiler based on Clang (arm.com)
Bruce = Bruce C Compiler
CCur = Concurrent Fortran (ccur.com)
Clang = LLVM Clang (clang.llvm.org)
diff --git a/Modules/CMakeCompilerIdDetection.cmake
b/Modules/CMakeCompilerIdDetection.cmake
index ed288f5..bb573b7 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -76,6 +76,7 @@ function(compiler_id_detection outvar lang)
SCO
ARMCC
AppleClang
+ ARMClang
Clang
GNU
MSVC
diff --git a/Modules/CMakeDetermineASMCompiler.cmake
b/Modules/CMakeDetermineASMCompiler.cmake
index eabb8b5..fb005ff 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -66,6 +66,10 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_AppleClang "--version")
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_AppleClang "(Apple LLVM
version)")
+ list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS ARMClang )
+ set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_ARMClang "--version")
+ set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMClang "armclang")
+
list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP )
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V")
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_HP "HP C")
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 3ec534f..495d7e8 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -82,6 +82,9 @@ else()
# Try compiling K code (needed by Bruce C Compiler).
"-D__CLASSIC_C__"
+
+# ARMClang need target options
+"--target=arm-arm-none-eabi -mcpu=cortex-m3"
)
endif()
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index 68cb9fe..afcd956 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -77,6 +77,9 @@ else()
# IAR does not detect language automatically
"--c++"
"--ec++"
+
+# ARMClang need target options
+"--target=arm-arm-none-eabi -mcpu=cortex-m3"
)
endif()
diff --git a/Modules/CMakeDetermineCompilerId.cmake
b/Modules/CMakeDetermineCompilerId.cmake
index 746a806..1cd919a 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -28,6 +28,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
foreach(testflags ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS_FIRST}
""
${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS})
+ separate_arguments(testflags UNIX_COMMAND "${testflags}")
CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${testflags}"
"${userflags}" "${src}")
[Cmake-commits] CMake branch, master, updated. v3.14.4-979-g92b7a8f
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 92b7a8fa2976208e3f7e5f1c5db422982b0dc1d4 (commit)
via 9fdad3a601e529e07c23d34cab8279747e11054e (commit)
via 62b0d14e24907f1b234d18035c3a44b94b32c808 (commit)
via fb39f09dc2b4bc7ccca9a8836c4bca4e879a0ed5 (commit)
via e1e3935f5d93687040738943bccdd53b6926f9ae (commit)
via 23b3ca5e1f599d05e822b651a09bb8b9e0df6240 (commit)
via 49f8351a1812ea55acd97aca15f72bf677e00fa9 (commit)
from 82c6ec964db9ff3cc6bece9bc0667e5ec691f02d (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=92b7a8fa2976208e3f7e5f1c5db422982b0dc1d4
commit 92b7a8fa2976208e3f7e5f1c5db422982b0dc1d4
Merge: 9fdad3a fb39f09
Author: Brad King
AuthorDate: Thu May 16 14:21:22 2019 +
Commit: Kitware Robot
CommitDate: Thu May 16 10:21:56 2019 -0400
Merge topic 'sunpro-supports-cxx14-release-note'
fb39f09dc2 Help: Add release note that SunPro supports C++14
Acked-by: Kitware Robot
Merge-request: !3329
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fdad3a601e529e07c23d34cab8279747e11054e
commit 9fdad3a601e529e07c23d34cab8279747e11054e
Merge: 62b0d14 e1e3935
Author: Brad King
AuthorDate: Thu May 16 14:20:51 2019 +
Commit: Kitware Robot
CommitDate: Thu May 16 10:21:02 2019 -0400
Merge topic 'FindBoost-allow-root'
e1e3935f5d FindBoost: Remove obsolete diagnostic message about Boost_ROOT
Acked-by: Kitware Robot
Merge-request: !3323
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62b0d14e24907f1b234d18035c3a44b94b32c808
commit 62b0d14e24907f1b234d18035c3a44b94b32c808
Merge: 82c6ec9 23b3ca5
Author: Brad King
AuthorDate: Thu May 16 14:19:40 2019 +
Commit: Kitware Robot
CommitDate: Thu May 16 10:19:51 2019 -0400
Merge topic 'update-kwsys'
23b3ca5e1f Merge branch 'upstream-KWSys' into update-kwsys
49f8351a18 KWSys 2019-05-15 (dea11658)
Acked-by: Kitware Robot
Merge-request: !3325
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb39f09dc2b4bc7ccca9a8836c4bca4e879a0ed5
commit fb39f09dc2b4bc7ccca9a8836c4bca4e879a0ed5
Author: Robert Maynard
AuthorDate: Wed May 15 12:29:36 2019 -0400
Commit: Robert Maynard
CommitDate: Wed May 15 12:29:36 2019 -0400
Help: Add release note that SunPro supports C++14
diff --git a/Help/release/dev/sunpro-supports-cxx14.rst
b/Help/release/dev/sunpro-supports-cxx14.rst
new file mode 100644
index 000..c287386
--- /dev/null
+++ b/Help/release/dev/sunpro-supports-cxx14.rst
@@ -0,0 +1,4 @@
+sunpro-supports-cxx14
+-
+
+* SunPro compiler have learned how to compile C++14.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1e3935f5d93687040738943bccdd53b6926f9ae
commit e1e3935f5d93687040738943bccdd53b6926f9ae
Author: Dennis Klein
AuthorDate: Tue May 14 20:10:22 2019 +0200
Commit: Dennis Klein
CommitDate: Wed May 15 15:45:14 2019 +0200
FindBoost: Remove obsolete diagnostic message about Boost_ROOT
CMake 3.12 introduced _ROOT CMake and environment variables to
be valid hints to find_package(). Defining Boost_ROOT is no
longer wrong if CMP0074 is set to NEW.
Fixes #18810
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 23549cb..018f675 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1265,7 +1265,11 @@ if(WIN32)
INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
endif()
-_Boost_CHECK_SPELLING(Boost_ROOT)
+cmake_policy(GET CMP0074 _Boost_CMP0074)
+if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx")
+ _Boost_CHECK_SPELLING(Boost_ROOT)
+endif()
+unset(_Boost_CMP0074)
_Boost_CHECK_SPELLING(Boost_LIBRARYDIR)
_Boost_CHECK_SPELLING(Boost_INCLUDEDIR)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23b3ca5e1f599d05e822b651a09bb8b9e0df6240
commit 23b3ca5e1f599d05e822b651a09bb8b9e0df6240
Merge: 6faa690 49f8351
Author: Brad King
AuthorDate: Wed May 15 09:10:03 2019 -0400
Commit: Brad King
CommitDate: Wed May 15 09:10:03 2019 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-05-15 (dea11658)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49f8351a1812ea55acd97aca15f72bf677e00fa9
commit 49f8351a1812ea55acd97aca15f72bf677e00fa9
Author: KWSys Upstream
AuthorDate: Wed May 15 09:08:25 2019 -0400
Commit: Brad King
CommitDate: Wed May 15 09:09:59 2019 -0400
KWSys 2019-05-15 (dea11658)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit
[Cmake-commits] CMake branch, master, updated. v3.14.4-972-g82c6ec9
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 82c6ec964db9ff3cc6bece9bc0667e5ec691f02d (commit) from 9ee24ede7363f8349c876e2f1dbbc541f60e3452 (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=82c6ec964db9ff3cc6bece9bc0667e5ec691f02d commit 82c6ec964db9ff3cc6bece9bc0667e5ec691f02d Author: Kitware Robot AuthorDate: Thu May 16 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Thu May 16 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 90dd14f..8c3fa94 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 20190515) +set(CMake_VERSION_PATCH 20190516) #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-971-g9ee24ed
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 9ee24ede7363f8349c876e2f1dbbc541f60e3452 (commit) via 2a9ff9703e20172ca14b6c872b300d0dbb75f5da (commit) from 66efdbd21a46b63572f5de677ed126a68e524e7a (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=9ee24ede7363f8349c876e2f1dbbc541f60e3452 commit 9ee24ede7363f8349c876e2f1dbbc541f60e3452 Merge: 66efdbd 2a9ff97 Author: Brad King AuthorDate: Wed May 15 18:06:36 2019 + Commit: Kitware Robot CommitDate: Wed May 15 14:06:58 2019 -0400 Merge topic 'msvc-jmc' 2a9ff9703e MSVC: Add support for /JMC (Just My Code) Acked-by: Kitware Robot Merge-request: !3121 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9ff9703e20172ca14b6c872b300d0dbb75f5da commit 2a9ff9703e20172ca14b6c872b300d0dbb75f5da Author: Luca Cappa AuthorDate: Tue Mar 19 13:52:53 2019 -0700 Commit: Brad King CommitDate: Tue May 14 13:27:18 2019 -0400 MSVC: Add support for /JMC (Just My Code) diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index c11496c..be30e96 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -333,6 +333,7 @@ Properties on Targets /prop_tgt/VS_GLOBAL_variable /prop_tgt/VS_IOT_EXTENSIONS_VERSION /prop_tgt/VS_IOT_STARTUP_TASK + /prop_tgt/VS_JUST_MY_CODE_DEBUGGING /prop_tgt/VS_KEYWORD /prop_tgt/VS_MOBILE_EXTENSIONS_VERSION /prop_tgt/VS_NO_SOLUTION_DEPLOY diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 6d93ae9..d445bc1 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -418,6 +418,7 @@ Variables that Control the Build /variable/CMAKE_VS_GLOBALS /variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD /variable/CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD + /variable/CMAKE_VS_JUST_MY_CODE_DEBUGGING /variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES /variable/CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES /variable/CMAKE_VS_SDK_INCLUDE_DIRECTORIES diff --git a/Help/prop_tgt/VS_JUST_MY_CODE_DEBUGGING.rst b/Help/prop_tgt/VS_JUST_MY_CODE_DEBUGGING.rst new file mode 100644 index 000..42fb8ad --- /dev/null +++ b/Help/prop_tgt/VS_JUST_MY_CODE_DEBUGGING.rst @@ -0,0 +1,10 @@ +VS_JUST_MY_CODE_DEBUGGING +- + +Enable Just My Code with Visual Studio debugger. + +Supported on :ref:`Visual Studio Generators` for VS 2010 and higher, +:ref:`Makefile Generators` and the :generator:`Ninja` generators. + +This property is initialized by the :variable:`CMAKE_VS_JUST_MY_CODE_DEBUGGING` +variable if it is set when a target is created. diff --git a/Help/release/dev/vs-just-my-code-debugging.rst b/Help/release/dev/vs-just-my-code-debugging.rst new file mode 100644 index 000..73299d9 --- /dev/null +++ b/Help/release/dev/vs-just-my-code-debugging.rst @@ -0,0 +1,9 @@ +vs-just-my-code-debugging +- + +* For the :ref:`Visual Studio Generators`, for the + :ref:`Makefile Generators` and the :generator:`Ninja` generator + the Just My Code feature of the Visual Studio Debugger could be + leveraged by turning on the :prop_tgt:`VS_JUST_MY_CODE_DEBUGGING` target + property. Its default value is provided by the variable + :variable:`CMAKE_VS_JUST_MY_CODE_DEBUGGING`. diff --git a/Help/variable/CMAKE_VS_JUST_MY_CODE_DEBUGGING.rst b/Help/variable/CMAKE_VS_JUST_MY_CODE_DEBUGGING.rst new file mode 100644 index 000..546cdf4 --- /dev/null +++ b/Help/variable/CMAKE_VS_JUST_MY_CODE_DEBUGGING.rst @@ -0,0 +1,8 @@ +CMAKE_VS_JUST_MY_CODE_DEBUGGING +--- + +Enable Just My Code with Visual Studio debugger. + +This variable is used to initialize the :prop_tgt:`VS_JUST_MY_CODE_DEBUGGING` +property on all targets when they are created. See that target property for +additional information. diff --git a/Modules/Compiler/MSVC-C.cmake b/Modules/Compiler/MSVC-C.cmake index f56227b..20787a3 100644 --- a/Modules/Compiler/MSVC-C.cmake +++ b/Modules/Compiler/MSVC-C.cmake @@ -31,3 +31,8 @@ macro(cmake_record_c_compile_features) endif() set(_result 0) # expected by cmake_determine_compile_features endmacro() + +# /JMC "Just My Code" is only supported by MSVC 19.05 onward. +if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.05) + set(CMAKE_C_COMPILE_OPTIONS_JMC "-JMC") +endif() diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake index 787c17e..378a119 100644 --- a/Modules/Compiler/MSVC-CXX.cmake +++ b/Modules/Compiler/MSVC-CXX.cmake @@ -64,3 +64,8 @@ elseif
[Cmake-commits] CMake branch, master, updated. v3.14.4-969-g66efdbd
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 66efdbd21a46b63572f5de677ed126a68e524e7a (commit) via 0064edf4173fad72749da2c66753387e9a671223 (commit) via ac0411f1662f64fe1320e22e5a8906b8a40d6677 (commit) via 7063ed271e5343adafa485e82614f844a8e31d24 (commit) via 359e2d401d72f36eb297d0aa52ff255fdaef2af7 (commit) via b5bf369ec68a60bf71297e941bcc742904aae148 (commit) via 4e2ce0a67ae3c4355c696b018da28e23853f991f (commit) via dfa24355eacbf99cf98bbf4027b8188c13ac7154 (commit) via 338994d65d35e08e5ac4c71eee662c1b38aee53a (commit) via c11f089d7381747d9e2eac88c00621e2ec32e4b7 (commit) via 012d599e26392312266e96d5ff6d0b905e7e2647 (commit) via 890a1b9dc34820b73f77221f68e04cf1ae811234 (commit) via 7b23001f20440d6c631d9fd6df4ec0092efce4f5 (commit) via d745df4b01f860c16fd65494a9735d1c73cfde04 (commit) via 124ec11720ba116fcec73c2397b43fb040d8b173 (commit) via 43640fc80aaff645ba0d2897667cd2b4a85add03 (commit) via 7c8c18b1e61ca717941214c2365ce5c5056bad14 (commit) via 9f76961de87d8911d13867d469c38087e47a0b60 (commit) from 6faa69047fc393219ec56627e15ebce039c45171 (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=66efdbd21a46b63572f5de677ed126a68e524e7a commit 66efdbd21a46b63572f5de677ed126a68e524e7a Merge: 0064edf b5bf369 Author: Brad King AuthorDate: Wed May 15 13:21:59 2019 + Commit: Kitware Robot CommitDate: Wed May 15 09:22:18 2019 -0400 Merge topic 'additional_clean_files' b5bf369ec6 Release notes: Add release notes for ADDITIONAL_CLEAN_FILES properties 4e2ce0a67a Doc: Update and deprecate ADDITIONAL_MAKE_CLEAN_FILES directory property 338994d65d Doc: Add documentation for ADDITIONAL_CLEAN_FILES properties c11f089d73 Tests: Extend MakeClean test to cover ADDITIONAL_CLEAN_FILES 012d599e26 Ninja: Add support for ADDITIONAL_CLEAN_FILES target property 890a1b9dc3 Ninja: Add support for ADDITIONAL_CLEAN_FILES directory property 7b23001f20 Ninja: Add support for additional clean files d745df4b01 Makefiles: Add support for ADDITIONAL_CLEAN_FILES target property ... Acked-by: Kitware Robot Merge-request: !3318 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0064edf4173fad72749da2c66753387e9a671223 commit 0064edf4173fad72749da2c66753387e9a671223 Merge: ac0411f 9f76961 Author: Brad King AuthorDate: Wed May 15 13:20:24 2019 + Commit: Kitware Robot CommitDate: Wed May 15 09:21:08 2019 -0400 Merge topic 'ninja-pool-custom-command' 9f76961de8 Support job pools in custom commands and targets Acked-by: Kitware Robot Merge-request: !3308 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac0411f1662f64fe1320e22e5a8906b8a40d6677 commit ac0411f1662f64fe1320e22e5a8906b8a40d6677 Merge: 7063ed2 dfa2435 Author: Brad King AuthorDate: Wed May 15 13:19:27 2019 + Commit: Kitware Robot CommitDate: Wed May 15 09:19:43 2019 -0400 Merge topic 'cmuvprocesschain-iterator-fix' dfa24355ea cmUVProcessChain: Add assert() for static analysis tools Acked-by: Kitware Robot Merge-request: !3322 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7063ed271e5343adafa485e82614f844a8e31d24 commit 7063ed271e5343adafa485e82614f844a8e31d24 Merge: 6faa690 359e2d4 Author: Craig Scott AuthorDate: Wed May 15 13:18:28 2019 + Commit: Kitware Robot CommitDate: Wed May 15 09:18:40 2019 -0400 Merge topic 'refactor_docs_use_java' 359e2d401d UseJava: Refactor documentation for better formatting Acked-by: Kitware Robot Merge-request: !3303 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=359e2d401d72f36eb297d0aa52ff255fdaef2af7 commit 359e2d401d72f36eb297d0aa52ff255fdaef2af7 Author: Robert Maynard AuthorDate: Fri May 10 10:24:16 2019 -0400 Commit: Craig Scott CommitDate: Wed May 15 22:54:15 2019 +1000 UseJava: Refactor documentation for better formatting Co-Authored-By: Craig Scott diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 5600b4c..b0315b2 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -8,289 +8,234 @@ UseJava Use Module for Java This file provides functions for Java. It is assumed that -FindJava.cmake has already been loaded. See FindJava.cmake for +:module:`FindJava` has already been loaded. See :module:`FindJava` for information on how to load Java into your CMake project. -:: +Creating And Installing JARs + + +..
[Cmake-commits] CMake branch, master, updated. v3.14.4-949-g38bedae
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 38bedaef726529298604823ae11f03270ca82526 (commit) from e2d0aea2c734c8c5028f3573082e75bd157dbe72 (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=38bedaef726529298604823ae11f03270ca82526 commit 38bedaef726529298604823ae11f03270ca82526 Author: Kitware Robot AuthorDate: Wed May 15 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Wed May 15 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9f2754f..90dd14f 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 20190514) +set(CMake_VERSION_PATCH 20190515) #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.14.4, created. v3.14.4
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.4 has been created at ad7b83f78eb5bf2ce30a0ff3eac5214eea8548fe (tag) tagging f872033d7531ed1d7d7345ff7873442ec8dbcee1 (commit) replaces v3.14.3 tagged by Brad King on Tue May 14 13:38:22 2019 -0400 - Log - CMake 3.14.4 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlza/Q4WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhO96D/4hKyUi4keVaT6qW1dsledQrNog Jr8pIHDbP4K7/FNkdtR2c88Ao76UOevwWGt2ylpbOVRM4FC8Mqy36mhKcEP6nMV+ NStnO8hnJsYGja8GvD8UOI/2+hNzNAyuNNMBCyLR/MU2ReWt1M+ollTv1yiaeZcG TXb3mO1/MVAtvjgbHtUKJdZLoburJgB6wEuRa/xwoCDXK5sEDg0ImXGCOc6gLju+ WoefrLg35i8I2kxQ8CaotK6EZtvLaQ0uhaID5Ded7aQS+OTGitcQlJM83CtBwIjd 37k67JpJWV1kRPQadl6CeYvvU8A1RF5HY91H/sORrmII9dEAVHTM3PWxty/9jcZV bpCeoBUkzObH43A8NJ/9E66+3HiAx7rSrTVQB/HgGyx/O7D95E6SqbFMyWljDRH8 owa5Y8VOWolLdxsZBt0reczmE0Lxe0eZsQBZ5/iwrPiOSuIcZY06y3HRk1iBik2k HN0nw516slbQO4FPLxv0MurXP+jAlaBTUj6DoeXkVmEtceyEJbLHUi8ssQqxh8Gp 1Dvtdo+cVNEOuSVZn43ObxShwQDK7iEEGsTZIzaPhcyXoOxpjee3tj4e2EobxZEA U3hBNoHJTJVjJ9eN3sCCGSBhr08C/wDmjh2eJrJdsYUcZdl7D/ix0iZjnQSLLoAR jNW+rztEEloj0EzY3A== =8Iby -END PGP SIGNATURE- Alex Turbov (2): FindBoost: Record compiler features for Boost 1.67 and above FindBoost: Fix compiler features for `fiber` and `context` Alexandru Croitor (1): iOS: Fix try_compile FILE_COPY not to fail Brad King (16): Merge branch 'wix-cmake-downgrade-fix' into release-3.13 target_link_libraries: Fix static library private deps in other dirs Merge branch 'out-of-dir-linking-private-deps' into release-3.13 Merge branch 'out-of-dir-linking-private-deps' into release-3.14 Merge branch 'FindBoost-fix-fiber-compiler-features' into release-3.14 Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14 Merge branch 'fix_ios_try_compile' into release-3.14 Merge branch 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' into release-3.14 Merge branch 'touch-after-ranlib' into release-3.14 Merge branch 'ios-xctest-lookup' into release-3.14 Merge branch 'swig4' into release-3.14 Help: Add 3.13.5 release notes Merge branch 'doc-relnotes-3.13' into doc-relnotes-3.14 Help: Add 3.14.4 release notes Merge branch 'doc-relnotes-3.14' into release-3.14 CMake 3.14.4 Daniele E. Domenichelli (1): FindSWIG: Support swig4.0 Gregor Jasny (2): Apple: Preserve high resolution mtime for static libraries Apple: Properly lookup XCTest for iOS and tvOS Marc Chevrier (2): FindPython: NumPy: fix erroneous dependencies management FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly --- 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.3-972-ge2d0aea
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 e2d0aea2c734c8c5028f3573082e75bd157dbe72 (commit) via f872033d7531ed1d7d7345ff7873442ec8dbcee1 (commit) from 7c3b84e3cd1b07ac21b5b2d11426e575a42c38cc (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=e2d0aea2c734c8c5028f3573082e75bd157dbe72 commit e2d0aea2c734c8c5028f3573082e75bd157dbe72 Merge: 7c3b84e f872033 Author: Brad King AuthorDate: Tue May 14 13:49:10 2019 -0400 Commit: Brad King CommitDate: Tue May 14 13:49:10 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, release, updated. v3.14.3-24-gf872033
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 f872033d7531ed1d7d7345ff7873442ec8dbcee1 (commit) from 319b47c9c7786f87672e0d8350d3e7d5b1bf2b9e (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 annotated tag, v3.13.5, created. v3.13.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.13.5 has been created at 753cff9411e32a7e6d8d5a25de1e66261dacc8e9 (tag) tagging f00f3fb4ab93ed3d914f881874919e143bc240ce (commit) replaces v3.13.4 tagged by Brad King on Tue May 14 12:37:00 2019 -0400 - Log - CMake 3.13.5 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlza7qwWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhNwxD/47lVUn8yL8TtMupCWLdKDfpGgO 0RE1+CUkYp5TWwk7m4WCU+LG/99xBN4PGJtHxuFxQRy3ve6lzF61MWZFJrgMPGFz cit+wgDqlnrzG4UEfzzYU0fdPMqaHzBm9jLwEri37LxcyZV4swgLCqQUzcVwS6bJ 7DV2YgUjITA1qeJuLheDq0jMnjpZiZbC/NYXM132YaWgQqa55OLm8QNbF3b7DajC wjtVBVjjOIAV/Rz2g88obXSnk9xT8JsowhFH7cYXZCTJWF5IfIvw0TC+GT//Lz4O vrKnG2hgKiTrEeGIsN4cY4jCKD4qYfe3rMS/VhePTVRnNxA9f+1d/VMgADVFiS3K AxQ4ylMz/e3l2/PnqQmGAjWvM9i4CqLpxOxPs+1P2Kd/o+VbC3mu2kDu0LwTdwJt J5NpsLkBqn9krjMdteNhgc145ftILMCZiYiAYV8OdIdVeLloR+fzV45txLeC5Hbq UPKXI6bu1Vff8H1SO3/tRzNiF6J0lX6ee8ZYlOJ/Z0ZQf2OIWysHeNIZ7clCyJIY sPgDvUpB4Ssfd2H9bHISTT4JCyRbKtcSqQIlX0vUqpHp+JZ1EEz+Q20I2sFGPw0l Nsypp/ii0txwMWQ/IfJCNP5/NVuDQc9LJ5Op8yDbu0dg9ppjPxbFO5dzxhPMtlfg XsiFAJhCBx1nrTGK4A== =1oSQ -END PGP SIGNATURE- Brad King (6): Merge branch 'wix-cmake-downgrade-fix' into release-3.13 target_link_libraries: Fix static library private deps in other dirs Merge branch 'out-of-dir-linking-private-deps' into release-3.13 Help: Add 3.13.5 release notes Merge branch 'doc-relnotes-3.13' into release-3.13 CMake 3.13.5 Nils Gladitz (1): CMake: Fix WiX installer downgrades with versioned binaries --- 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.3-970-g7c3b84e
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 7c3b84e3cd1b07ac21b5b2d11426e575a42c38cc (commit) via f00f3fb4ab93ed3d914f881874919e143bc240ce (commit) from a9837130cdda163225367aaed51d66ba4d924e34 (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=7c3b84e3cd1b07ac21b5b2d11426e575a42c38cc commit 7c3b84e3cd1b07ac21b5b2d11426e575a42c38cc Merge: a983713 f00f3fb Author: Brad King AuthorDate: Tue May 14 12:17:44 2019 -0400 Commit: Brad King CommitDate: Tue May 14 12:17:44 2019 -0400 Merge branch 'release-3.13' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f00f3fb4ab93ed3d914f881874919e143bc240ce commit f00f3fb4ab93ed3d914f881874919e143bc240ce Author: Brad King AuthorDate: Tue May 14 11:31:59 2019 -0400 Commit: Brad King CommitDate: Tue May 14 11:31:59 2019 -0400 CMake 3.13.5 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 025ce32..fcd2625 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 13) -set(CMake_VERSION_PATCH 4) +set(CMake_VERSION_PATCH 5) #set(CMake_VERSION_RC 0) --- 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.3-968-ga983713
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 a9837130cdda163225367aaed51d66ba4d924e34 (commit) via 319b47c9c7786f87672e0d8350d3e7d5b1bf2b9e (commit) via c0b6eec800beb8335127043d2fee99cf8388b64b (commit) via c526afedb98c15f4c994a1903555ab6268b3 (commit) via a0b07cdcf54d661c8f61f8a83dc11427998d3e14 (commit) via f2aeba927c89ad6b59b86d83cba40e5178231334 (commit) via 1d645e9891cb017f8d56c24d39e5e5fb128c6272 (commit) via d6b8822919c70fb1e60d6319a81e7691be416ab5 (commit) from 2389fcc677414b95667caa898e1b396e96b4bf3f (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=a9837130cdda163225367aaed51d66ba4d924e34 commit a9837130cdda163225367aaed51d66ba4d924e34 Merge: c0b6eec 319b47c Author: Brad King AuthorDate: Tue May 14 11:30:25 2019 -0400 Commit: Brad King CommitDate: Tue May 14 11:30:25 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0b6eec800beb8335127043d2fee99cf8388b64b commit c0b6eec800beb8335127043d2fee99cf8388b64b Merge: a0b07cd c52 Author: Brad King AuthorDate: Tue May 14 11:28:26 2019 -0400 Commit: Brad King CommitDate: Tue May 14 11:28:26 2019 -0400 Merge branch 'release-3.13' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c526afedb98c15f4c994a1903555ab6268b3 commit c526afedb98c15f4c994a1903555ab6268b3 Merge: c9469c7 d6b8822 Author: Brad King AuthorDate: Tue May 14 11:27:41 2019 -0400 Commit: Brad King CommitDate: Tue May 14 11:27:41 2019 -0400 Merge branch 'doc-relnotes-3.13' into release-3.13 Merge-request: !3319 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0b07cdcf54d661c8f61f8a83dc11427998d3e14 commit a0b07cdcf54d661c8f61f8a83dc11427998d3e14 Merge: 2389fcc f2aeba9 Author: Brad King AuthorDate: Tue May 14 15:26:09 2019 + Commit: Kitware Robot CommitDate: Tue May 14 11:26:18 2019 -0400 Merge topic 'doc-relnotes-3.14' f2aeba927c Help: Add 3.14.4 release notes 1d645e9891 Merge branch 'doc-relnotes-3.13' into doc-relnotes-3.14 d6b8822919 Help: Add 3.13.5 release notes Acked-by: Kitware Robot Merge-request: !3319 --- Summary of changes: Help/release/3.13.rst | 9 + Help/release/3.14.rst | 10 ++ 2 files changed, 19 insertions(+) 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.3-23-g319b47c
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 319b47c9c7786f87672e0d8350d3e7d5b1bf2b9e (commit) via f2aeba927c89ad6b59b86d83cba40e5178231334 (commit) via 1d645e9891cb017f8d56c24d39e5e5fb128c6272 (commit) via d6b8822919c70fb1e60d6319a81e7691be416ab5 (commit) via c9469c78a5545b5a04ecf0f27b50500140aca5e9 (commit) via 0c2469e3fbf359934f266aa5dbcc69d78a618bab (commit) from 016a8bc6593a0015b3082e152f1f5277b03cd7bd (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.13.rst | 9 + Help/release/3.14.rst | 10 ++ 2 files changed, 19 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.3-960-g2389fcc
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 2389fcc677414b95667caa898e1b396e96b4bf3f (commit)
via 5108759ed2bb211105f02fcc857fc89f3db768f0 (commit)
from 1f0a695561f12b8e3929066d7dc61535a20af66c (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=2389fcc677414b95667caa898e1b396e96b4bf3f
commit 2389fcc677414b95667caa898e1b396e96b4bf3f
Merge: 1f0a695 5108759
Author: Brad King
AuthorDate: Tue May 14 15:14:19 2019 +
Commit: Kitware Robot
CommitDate: Tue May 14 11:14:33 2019 -0400
Merge topic 'find-boost-cmp0093'
5108759ed2 FindBoost: Introduce CMP0093 to report Boost_VERSION in x.y.z
format
Acked-by: Kitware Robot
Merge-request: !3317
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5108759ed2bb211105f02fcc857fc89f3db768f0
commit 5108759ed2bb211105f02fcc857fc89f3db768f0
Author: Dennis Klein
AuthorDate: Fri May 3 20:23:08 2019 +0200
Commit: Brad King
CommitDate: Mon May 13 11:57:12 2019 -0400
FindBoost: Introduce CMP0093 to report Boost_VERSION in x.y.z format
This aligns module mode behaviour with config mode.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 8fcd386..8d35b86 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -57,6 +57,7 @@ Policies Introduced by CMake 3.15
.. toctree::
:maxdepth: 1
+ CMP0093: FindBoost reports Boost_VERSION in x.y.z format.
CMP0092: MSVC warning flags are not in CMAKE_{C,CXX}_FLAGS by default.
CMP0091: MSVC runtime library flags are selected by an abstraction.
CMP0090: export(PACKAGE) does not populate package registry by default.
diff --git a/Help/policy/CMP0093.rst b/Help/policy/CMP0093.rst
new file mode 100644
index 000..0ffc493
--- /dev/null
+++ b/Help/policy/CMP0093.rst
@@ -0,0 +1,24 @@
+CMP0093
+---
+
+:module:`FindBoost` reports ``Boost_VERSION`` in ``x.y.z`` format.
+
+In CMake 3.14 and below the module would report the Boost version
+number as specified in the preprocessor definition ``BOOST_VERSION`` in
+the ``boost/version.hpp`` file. In CMake 3.15 and later it is preferred
+that the reported version number matches the ``x.y.z`` format reported
+by the CMake package shipped with Boost ``1.70.0`` and later. The macro
+value is still reported in the ``Boost_VERSION_MACRO`` variable.
+
+The ``OLD`` behavior for this policy is for :module:`FindBoost` to report
+``Boost_VERSION`` as specified in the preprocessor definition
+``BOOST_VERSION`` in ``boost/version.hpp``. The ``NEW`` behavior for this
+policy is for :module:`FindBoost` to report ``Boost_VERSION`` in
+``x.y.z`` format.
+
+This policy was introduced in CMake version 3.15. Use the
+:command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly.
+Unlike many policies, CMake version |release| does *not* warn
+when this policy is not set and simply uses the ``OLD`` behavior.
+
+.. include:: DEPRECATED.txt
diff --git a/Help/release/dev/FindBoost-fphsa.rst
b/Help/release/dev/FindBoost-fphsa.rst
index c4d34d4..30a4b13 100644
--- a/Help/release/dev/FindBoost-fphsa.rst
+++ b/Help/release/dev/FindBoost-fphsa.rst
@@ -29,3 +29,6 @@ FindBoost-fphsa
* The input switch ``Boost_DETAILED_FAILURE_MSG`` was
removed.
+
+ * ``Boost_VERSION`` now reports the version in ``x.y.z``
+format in module mode. See policy :policy:`CMP0093`.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 0f15190..23549cb 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -30,9 +30,10 @@ case results are reported in variables::
Boost__FOUND- True if component was found ( is upper-case)
Boost__LIBRARY - Libraries to link for component (may include
target_link_libraries debug/optimized keywords)
- Boost_VERSION - BOOST_VERSION value from boost/version.hpp
- alias: Boost_VERSION_MACRO
+ Boost_VERSION_MACRO- BOOST_VERSION value from boost/version.hpp
Boost_VERSION_STRING - Boost version number in x.y.z format
+ Boost_VERSION - if CMP0093 NEW => same as Boost_VERSION_STRING
+ if CMP0093 OLD or unset => same as
Boost_VERSION_MACRO
Boost_LIB_VERSION - Version string appended to library filenames
Boost_VERSION_MAJOR- Boost major version number (X in X.y.z)
alias: Boost_MAJOR_VERSION
@@ -1427,7 +1428,15 @@ if(Boost_INCLUDE_DIR)
set(Boost_VERSION_STRING
"${Boost_VERSION_MAJOR}.${Boost_VERSION_MINOR}.${Boost_VERSION_PATCH}")
[Cmake-commits] CMake branch, master, updated. v3.14.3-958-g1f0a695
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 1f0a695561f12b8e3929066d7dc61535a20af66c (commit) via bae7a2e25074145a8b57baa96624f0b87428840d (commit) via 050bf5747287f9c00be5e2659d93c2b164d0dcec (commit) via 0302d40faa572aeca1769969550730cd9b283b1b (commit) via 730d8a135e140f0e7860021b7989954a893798d4 (commit) via d156f8f5a2702aa64b74fa01f48b38c7078054d1 (commit) via 62dbe53a8a2809c0c38386e5880acb446feacf28 (commit) via 1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b (commit) via 054954d855fea6f4dd31fbd78c5e0cab0635396e (commit) via 30a550d6ade191e6510fb74a73fe34f1615b6086 (commit) via 0024356f8e8e5f9ec2fa6af1e651c634eba3b22b (commit) via b133d14fb1c0183c647136188cf4fff0ed05c58e (commit) via 8cc04b1918301964ef7de0f44b77fdf1d82729ba (commit) via cdff7f4e2a255e083e5a19ac541b4de2874785af (commit) via 8691b3cf914c97ed9e3612009707bc5a791ef4f0 (commit) via 47da9859e8b5e938fa40b69d117aecef82e090a9 (commit) via 990270213408bb4d11fa620ba9c96b25da313945 (commit) via 12aa6fe07bc2f3903386fb1f57ace6601ec91100 (commit) via 02293841e742c14a18155bc0e10c39462c97dcbf (commit) via a173a1173e06dad812afe17c9751cb7c2f94eda4 (commit) from e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6 (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=1f0a695561f12b8e3929066d7dc61535a20af66c commit 1f0a695561f12b8e3929066d7dc61535a20af66c Merge: bae7a2e cdff7f4 Author: Brad King AuthorDate: Tue May 14 14:54:08 2019 + Commit: Kitware Robot CommitDate: Tue May 14 10:58:43 2019 -0400 Merge topic 'cmSytemTools_ExpandedList' cdff7f4e2a cmSystemTools: Add ExpandedListArgument and ExpandedLists methods Acked-by: Kitware Robot Acked-by: Ben Boeckel Merge-request: !3313 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bae7a2e25074145a8b57baa96624f0b87428840d commit bae7a2e25074145a8b57baa96624f0b87428840d Merge: 050bf57 8cc04b1 Author: Brad King AuthorDate: Tue May 14 14:53:28 2019 + Commit: Kitware Robot CommitDate: Tue May 14 10:57:44 2019 -0400 Merge topic 'error-generate-step' 8cc04b1918 cmake: Display error if generate step fails Acked-by: Kitware Robot Acked-by: Ben Boeckel Merge-request: !3304 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=050bf5747287f9c00be5e2659d93c2b164d0dcec commit 050bf5747287f9c00be5e2659d93c2b164d0dcec Merge: 0302d40 054954d Author: Brad King AuthorDate: Tue May 14 14:54:01 2019 + Commit: Kitware Robot CommitDate: Tue May 14 10:56:29 2019 -0400 Merge topic 'ninja_cleanups' 054954d855 Ninja: Use clean target instead of clean tool in `cmake --target clean` calls 30a550d6ad Ninja: In cmNinjaTargetGenerator use std::unique_ptr to manage new instances 0024356f8e Ninja: In cmNinjaTargetGenerator optimize string composition 8691b3cf91 Ninja: Inline range loop range arguments 47da9859e8 Ninja: In cmGlobalNinjaGenerator use std::unique_ptr to manage output streams 9902702134 Ninja: Add and use cmGlobalNinjaGenerator::CMakeCmd method 12aa6fe07b Ninja: Fix message in cmGlobalNinjaGenerator::WriteBuild method 02293841e7 Ninja: Simplify cmGlobalNinjaGenerator::AddRule and HasRule methods ... Acked-by: Kitware Robot Merge-request: !3312 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0302d40faa572aeca1769969550730cd9b283b1b commit 0302d40faa572aeca1769969550730cd9b283b1b Merge: 730d8a1 b133d14 Author: Brad King AuthorDate: Tue May 14 14:53:18 2019 + Commit: Kitware Robot CommitDate: Tue May 14 10:54:53 2019 -0400 Merge topic 'cminstallgenerator-compute-error' b133d14fb1 Refactor: Allow cmInstallGenerator::Compute() to return an error Acked-by: Kitware Robot Merge-request: !3305 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=730d8a135e140f0e7860021b7989954a893798d4 commit 730d8a135e140f0e7860021b7989954a893798d4 Merge: e0ab9e1 d156f8f Author: Brad King AuthorDate: Tue May 14 14:52:33 2019 + Commit: Kitware Robot CommitDate: Tue May 14 10:53:24 2019 -0400 Merge topic 'relax_cxx_relaxed_constexpr_requirements' d156f8f5a2 CompileFeatures: Record when MSVC gained full CXX14 support 62dbe53a8a CompileFeatures: Record when Intel gained full CXX14 support 1ebb0d79fe CompileFeatures: Relax cxx_relaxed_constexpr compiler requirements Acked-by: Kitware Robot Merge-request: !3292
[Cmake-commits] CMake branch, master, updated. v3.14.3-938-ge0ab9e1
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 e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6 (commit)
via 9ca45a51ae5ee511988728a84764e1b9eacf8f51 (commit)
via b0b357a878712d1125744d0afc7389239ec1def2 (commit)
via 7d9db24f4c1eb68687bf66002577781d01684478 (commit)
via 016a8bc6593a0015b3082e152f1f5277b03cd7bd (commit)
via 65c5c1b567bdeb4c33ac2f6ad92786c159edf82a (commit)
via 620e7b1c39848ab0c37ac643a9f1595fc1e0ba97 (commit)
via e9d128b789f91c3f8d22e366500f58e6c7f6abc6 (commit)
via 9523ca72e29350b66c37e60f9db6a8025f67cad1 (commit)
from 9d48d3f61b25400a191f12ea92b8e5496ab47a8f (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=e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6
commit e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6
Merge: 9ca45a5 9523ca7
Author: Brad King
AuthorDate: Tue May 14 14:51:49 2019 +
Commit: Kitware Robot
CommitDate: Tue May 14 10:52:17 2019 -0400
Merge topic 'apple_clang_cxx_20_support'
9523ca72e2 Features: Activate C++20 support for AppleClang 10.0+
Acked-by: Kitware Robot
Merge-request: !3294
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ca45a51ae5ee511988728a84764e1b9eacf8f51
commit 9ca45a51ae5ee511988728a84764e1b9eacf8f51
Merge: b0b357a 016a8bc
Author: Brad King
AuthorDate: Tue May 14 10:51:23 2019 -0400
Commit: Brad King
CommitDate: Tue May 14 10:51:23 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0b357a878712d1125744d0afc7389239ec1def2
commit b0b357a878712d1125744d0afc7389239ec1def2
Merge: 7d9db24 65c5c1b
Author: Brad King
AuthorDate: Tue May 14 14:48:10 2019 +
Commit: Kitware Robot
CommitDate: Tue May 14 10:49:30 2019 -0400
Merge topic 'swig4'
65c5c1b567 FindSWIG: Support swig4.0
Acked-by: Kitware Robot
Merge-request: !3314
diff --cc Modules/FindSWIG.cmake
index a5e3a37,96b254f..ae6ae56
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@@ -19,14 -19,14 +19,14 @@@ This module finds an installed SWIG. I
The minimum required version of SWIG can be specified using the
-standard syntax, e.g. find_package(SWIG 1.1)
+standard syntax, e.g. :command:`find_package(SWIG 1.1)`
-All information is collected from the SWIG_EXECUTABLE so the version
+All information is collected from the ``SWIG_EXECUTABLE``, so the version
to be found can be changed from the command line by means of setting
-SWIG_EXECUTABLE
+``SWIG_EXECUTABLE``
#]===]
- find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
+ find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig)
if(SWIG_EXECUTABLE)
execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d9db24f4c1eb68687bf66002577781d01684478
commit 7d9db24f4c1eb68687bf66002577781d01684478
Merge: 9d48d3f e9d128b
Author: Brad King
AuthorDate: Tue May 14 14:48:04 2019 +
Commit: Kitware Robot
CommitDate: Tue May 14 10:48:13 2019 -0400
Merge topic 'ios-xctest-lookup'
e9d128b789 Apple: Properly lookup XCTest for iOS and tvOS
Acked-by: Kitware Robot
Merge-request: !3309
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9523ca72e29350b66c37e60f9db6a8025f67cad1
commit 9523ca72e29350b66c37e60f9db6a8025f67cad1
Author: Robert Maynard
AuthorDate: Tue May 7 13:38:35 2019 -0400
Commit: Robert Maynard
CommitDate: Tue May 7 16:24:08 2019 -0400
Features: Activate C++20 support for AppleClang 10.0+
diff --git a/Help/release/dev/apple-clang-supports-cxx20.rst
b/Help/release/dev/apple-clang-supports-cxx20.rst
new file mode 100644
index 000..f19ee68
--- /dev/null
+++ b/Help/release/dev/apple-clang-supports-cxx20.rst
@@ -0,0 +1,4 @@
+apple-clang-supports-cxx20
+--
+
+* AppleClang compiler have learned how to compile C++20.
diff --git a/Modules/Compiler/AppleClang-CXX.cmake
b/Modules/Compiler/AppleClang-CXX.cmake
index 2042360..1eae50e 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -28,9 +28,13 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
endif()
-
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
endif()
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+ set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a")
+
[Cmake-commits] CMake branch, release, updated. v3.14.3-17-g016a8bc
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 016a8bc6593a0015b3082e152f1f5277b03cd7bd (commit) via 65c5c1b567bdeb4c33ac2f6ad92786c159edf82a (commit) via 620e7b1c39848ab0c37ac643a9f1595fc1e0ba97 (commit) via e9d128b789f91c3f8d22e366500f58e6c7f6abc6 (commit) from 6ced0b97d5fbcaf94f88a5f3062beeb0ad75f186 (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/FindSWIG.cmake | 2 +- Modules/FindXCTest.cmake | 19 +++ Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 15 +++ Tests/RunCMake/XcodeProject/XCTestLookup.cmake | 3 +++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/XcodeProject/XCTestLookup.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.14.3-929-g9d48d3f
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 9d48d3f61b25400a191f12ea92b8e5496ab47a8f (commit) from f9feab40a195716a6bba11b39a809a18830df956 (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=9d48d3f61b25400a191f12ea92b8e5496ab47a8f commit 9d48d3f61b25400a191f12ea92b8e5496ab47a8f Author: Kitware Robot AuthorDate: Tue May 14 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Tue May 14 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index de5bd39..9f2754f 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 20190513) +set(CMake_VERSION_PATCH 20190514) #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.3-928-gf9feab4
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 f9feab40a195716a6bba11b39a809a18830df956 (commit)
via df6c4afa777098c6a2fcc01e4513ab5a6e444bc7 (commit)
via 15004e431923035227bf502fe07c6bef2beb2d74 (commit)
via bd6c3f8609b87f6995acb2aef21aa572f0f73fa7 (commit)
via 54903af84bc8656344e7fe1ea0a11d5f09e94f86 (commit)
via 081104fb003a56bb3d8330363795ace5b71bc3f8 (commit)
via eff6e622d6cd66186ad42c9ec2ae6b2055008707 (commit)
via 26025d6e106ffd4cd777fdc3a4343b33c8554c15 (commit)
via 6b04d1cdc281b9b0dee5f59394a1c41d8b96c4a1 (commit)
from 342936963479d59400a5f6ba8ef4de339212d303 (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=f9feab40a195716a6bba11b39a809a18830df956
commit f9feab40a195716a6bba11b39a809a18830df956
Merge: df6c4af 15004e4
Author: Brad King
AuthorDate: Mon May 13 14:41:50 2019 +
Commit: Kitware Robot
CommitDate: Mon May 13 10:42:02 2019 -0400
Merge topic 'autorcc_timestamp'
15004e4319 AutoRcc: Simplify error logging with utility lambda
bd6c3f8609 AutoRcc: Rebuild if the rcc executable is newer than its output
54903af84b AutoRcc: Don't read the info file time again
081104fb00 AutoRcc: Write re-generation reason and rcc command as one string
eff6e622d6 Autogen: A missing info file is a critical error
Acked-by: Kitware Robot
Merge-request: !3311
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df6c4afa777098c6a2fcc01e4513ab5a6e444bc7
commit df6c4afa777098c6a2fcc01e4513ab5a6e444bc7
Merge: 3429369 26025d6
Author: Brad King
AuthorDate: Mon May 13 14:37:56 2019 +
Commit: Kitware Robot
CommitDate: Mon May 13 10:38:09 2019 -0400
Merge topic 'cmuvprocesschain'
26025d6e10 cmUVProcessChain: Add cmUVProcessChain
6b04d1cdc2 cmUVStreambuf: Initialize all members on construction
Acked-by: Kitware Robot
Merge-request: !3275
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15004e431923035227bf502fe07c6bef2beb2d74
commit 15004e431923035227bf502fe07c6bef2beb2d74
Author: Sebastian Holtermann
AuthorDate: Sat May 11 21:39:41 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Sat May 11 22:15:47 2019 +0200
AutoRcc: Simplify error logging with utility lambda
diff --git a/Source/cmQtAutoRcc.cxx b/Source/cmQtAutoRcc.cxx
index 922767d..7ac7339 100644
--- a/Source/cmQtAutoRcc.cxx
+++ b/Source/cmQtAutoRcc.cxx
@@ -3,6 +3,8 @@
#include "cmQtAutoRcc.h"
#include "cmQtAutoGen.h"
+#include
+
#include "cmAlgorithms.h"
#include "cmCryptoHash.h"
#include "cmDuration.h"
@@ -49,11 +51,16 @@ bool cmQtAutoRcc::Init(cmMakefile* makefile)
cmSystemTools::ExpandListArgument(InfoGetConfig(key), list);
return list;
};
+ auto LogInfoError = [this](std::string const& msg) -> bool {
+std::ostringstream err;
+err << "In " << Quoted(this->InfoFile()) << ":\n" << msg;
+this->Log().Error(GenT::RCC, err.str());
+return false;
+ };
// -- Read info file
if (!makefile->ReadListFile(InfoFile())) {
-Log().ErrorFile(GenT::RCC, InfoFile(), "File processing failed.");
-return false;
+return LogInfoError("File processing failed.");
}
// - Configurations
@@ -63,14 +70,12 @@ bool cmQtAutoRcc::Init(cmMakefile* makefile)
// - Directories
AutogenBuildDir_ = InfoGet("ARCC_BUILD_DIR");
if (AutogenBuildDir_.empty()) {
-Log().ErrorFile(GenT::RCC, InfoFile(), "Build directory empty.");
-return false;
+return LogInfoError("Build directory empty.");
}
IncludeDir_ = InfoGetConfig("ARCC_INCLUDE_DIR");
if (IncludeDir_.empty()) {
-Log().ErrorFile(GenT::RCC, InfoFile(), "Include directory empty.");
-return false;
+return LogInfoError("Include directory empty.");
}
// - Rcc executable
@@ -79,8 +84,7 @@ bool cmQtAutoRcc::Init(cmMakefile* makefile)
std::string error = "The rcc executable ";
error += Quoted(RccExecutable_);
error += " does not exist.";
-Log().ErrorFile(GenT::RCC, InfoFile(), error);
-return false;
+return LogInfoError(error);
}
RccListOptions_ = InfoGetList("ARCC_RCC_LIST_OPTIONS");
@@ -99,28 +103,22 @@ bool cmQtAutoRcc::Init(cmMakefile* makefile)
// - Validity checks
if (LockFile_.empty()) {
-Log().ErrorFile(GenT::RCC, InfoFile(), "Lock file name missing.");
-return false;
+return LogInfoError("Lock file name missing.");
}
if (SettingsFile_.empty()) {
-Log().ErrorFile(GenT::RCC, InfoFile(), "Settings file name missing.");
-return false;
+return LogInfoError("Settings file name
[Cmake-commits] CMake branch, master, updated. v3.14.3-919-g3429369
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 342936963479d59400a5f6ba8ef4de339212d303 (commit) via daad51c3b7ab65276937b38dae566c3d25b80e0c (commit) from 2bc9ddcad9f9a01055e5e3acc02a501b31af9940 (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=342936963479d59400a5f6ba8ef4de339212d303 commit 342936963479d59400a5f6ba8ef4de339212d303 Merge: 2bc9ddc daad51c Author: Brad King AuthorDate: Mon May 13 14:13:40 2019 + Commit: Kitware Robot CommitDate: Mon May 13 10:13:52 2019 -0400 Merge topic 'apple_clang_full_cxx_14_support' daad51c3b7 CompileFeatures: Record when AppleClang gained full CXX14 support Acked-by: Kitware Robot Merge-request: !3293 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daad51c3b7ab65276937b38dae566c3d25b80e0c commit daad51c3b7ab65276937b38dae566c3d25b80e0c Author: Robert Maynard AuthorDate: Tue May 7 13:33:40 2019 -0400 Commit: Robert Maynard CommitDate: Tue May 7 13:33:40 2019 -0400 CompileFeatures: Record when AppleClang gained full CXX14 support Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++14 feature support when the running compiler is known to have all features. diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index 2042360..861a15c 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -17,10 +17,12 @@ endif() if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1) set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") + set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) # AppleClang 5.0 knows this flag, but does not set a __cplusplus macro greater than 201103L set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") + set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON) endif() if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1) --- Summary of changes: Modules/Compiler/AppleClang-CXX.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.3-917-g2bc9ddc
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 2bc9ddcad9f9a01055e5e3acc02a501b31af9940 (commit)
via 41780964936b03754a6551c65d4fd938521130b5 (commit)
from b498967243cb531c8c6fe60e6712432a2064507b (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=2bc9ddcad9f9a01055e5e3acc02a501b31af9940
commit 2bc9ddcad9f9a01055e5e3acc02a501b31af9940
Merge: b498967 4178096
Author: Brad King
AuthorDate: Mon May 13 14:03:25 2019 +
Commit: Kitware Robot
CommitDate: Mon May 13 10:03:35 2019 -0400
Merge topic 'iar-new_architectures'
4178096493 IAR: Add architecture support for RL78, RH850 and MSP430
Acked-by: Kitware Robot
Merge-request: !3288
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41780964936b03754a6551c65d4fd938521130b5
commit 41780964936b03754a6551c65d4fd938521130b5
Author: Stefan Andersson
AuthorDate: Mon May 6 11:25:34 2019 +0200
Commit: Brad King
CommitDate: Wed May 8 12:55:18 2019 -0400
IAR: Add architecture support for RL78, RH850 and MSP430
diff --git a/Help/release/dev/iar-new_architectures.rst
b/Help/release/dev/iar-new_architectures.rst
new file mode 100644
index 000..d661c80
--- /dev/null
+++ b/Help/release/dev/iar-new_architectures.rst
@@ -0,0 +1,6 @@
+iar-new_architectures
+-
+
+* Support was added for the IAR compiler architectures Renesas RX,
+ RL78, RH850 and Texas Instruments MSP430.
+* The IAR compilers built for Linux (IAR BuildLx) now work as well.
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index c88094a..8f5747a 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -159,9 +159,18 @@
# elif defined(__ICCRX__)
# define ARCHITECTURE_ID "RX"
+# elif defined(__ICCRH850__)
+# define ARCHITECTURE_ID "RH850"
+
+# elif defined(__ICCRL78__)
+# define ARCHITECTURE_ID "RL78"
+
# elif defined(__ICCAVR__)
# define ARCHITECTURE_ID "AVR"
+# elif defined(__ICC430__)
+# define ARCHITECTURE_ID "MSP430"
+
# else /* unknown architecture */
# define ARCHITECTURE_ID ""
# endif
diff --git a/Modules/Compiler/IAR-ASM.cmake b/Modules/Compiler/IAR-ASM.cmake
index f9c0ced..71f2ac6 100644
--- a/Modules/Compiler/IAR-ASM.cmake
+++ b/Modules/Compiler/IAR-ASM.cmake
@@ -12,11 +12,26 @@
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RX")
__compiler_iar_ilink(ASM)
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
+elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850")
+ set(CMAKE_ASM_COMPILE_OBJECT " --silent
-o ")
+ __compiler_iar_ilink(ASM)
+ set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
+
+elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78")
+ set(CMAKE_ASM_COMPILE_OBJECT " --silent
-o ")
+ __compiler_iar_ilink(ASM)
+ set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
+
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
set(CMAKE_ASM_COMPILE_OBJECT " -S
-o ")
__compiler_iar_xlink(ASM)
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s90;asm;msa)
+elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430")
+ set(CMAKE_ASM_COMPILE_OBJECT " -S
-o ")
+ __compiler_iar_xlink(ASM)
+ set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s43;asm;msa)
+
else()
message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID not
detected. This should be automatic.")
endif()
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake
index af5874c..4b02a9a 100644
--- a/Modules/Compiler/IAR-C.cmake
+++ b/Modules/Compiler/IAR-C.cmake
@@ -38,20 +38,23 @@ elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RX")
__compiler_iar_ilink(C)
__compiler_check_default_language_standard(C 1.10 90 2.10 99 4.10 11)
+elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850")
+ __compiler_iar_ilink(C)
+ __compiler_check_default_language_standard(C 1.10 90 1.10 99 2.10 11)
+
+elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78")
+ __compiler_iar_ilink(C)
+ __compiler_check_default_language_standard(C 1.10 90 1.10 99 4.10 11)
+
elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
__compiler_iar_xlink(C)
__compiler_check_default_language_standard(C 7.10 99)
set(CMAKE_C_OUTPUT_EXTENSION ".r90")
- if(NOT CMAKE_C_LINK_FLAGS)
-set(CMAKE_C_LINK_FLAGS "-Fmotorola")
- endif()
-
- # add the target specific include directory:
- get_filename_component(_compilerDir "${CMAKE_C_COMPILER}" PATH)
- get_filename_component(_compilerDir "${_compilerDir}" PATH)
-
[Cmake-commits] CMake branch, master, updated. v3.14.3-915-gb498967
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 b498967243cb531c8c6fe60e6712432a2064507b (commit)
via 9af34615ae1a84a890a280c3cdd75856e879fb64 (commit)
via 9a34031081ccd0a3a782d756d6e24be6fdc1740c (commit)
via 29f4f70b41858b8d89a4cf77a8f87ceb1df3b80a (commit)
via 1069a3f02bbe12fdf326cf7cfdb12820cee6030a (commit)
via 9a324cbee092276b4c344b5deec5875ab76b3e3b (commit)
from a8f1527ba46b31c5583999391c05421eb86f4973 (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=b498967243cb531c8c6fe60e6712432a2064507b
commit b498967243cb531c8c6fe60e6712432a2064507b
Merge: 9af3461 9a324cb
Author: Brad King
AuthorDate: Mon May 13 14:02:17 2019 +
Commit: Kitware Robot
CommitDate: Mon May 13 10:02:26 2019 -0400
Merge topic 'FindProtobuf-gen-sources'
9a324cbee0 Protobuf: Fix generated source path with
PROTOBUF_GENERATE_CPP_APPEND_PATH OFF
Acked-by: Kitware Robot
Merge-request: !3295
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af34615ae1a84a890a280c3cdd75856e879fb64
commit 9af34615ae1a84a890a280c3cdd75856e879fb64
Merge: a8f1527 9a34031
Author: Brad King
AuthorDate: Mon May 13 13:57:33 2019 +
Commit: Kitware Robot
CommitDate: Mon May 13 09:57:43 2019 -0400
Merge topic 'windows-signing'
9a34031081 Utilities/Release: Enable signing of Windows release binaries
29f4f70b41 Add undocumented option to sign CMake's own binaries on Windows
1069a3f02b Configure CMake itself with policies through CMake 3.14
Acked-by: Kitware Robot
Merge-request: !3296
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a34031081ccd0a3a782d756d6e24be6fdc1740c
commit 9a34031081ccd0a3a782d756d6e24be6fdc1740c
Author: Brad King
AuthorDate: Tue May 7 15:03:16 2019 -0400
Commit: Brad King
CommitDate: Wed May 8 13:18:31 2019 -0400
Utilities/Release: Enable signing of Windows release binaries
diff --git a/Utilities/Release/linux64_release.cmake
b/Utilities/Release/linux64_release.cmake
index fa585d7..958ed25 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -44,6 +44,7 @@
CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=${qt_xcb_libs}
set(ENV [[
export CMAKE_PREFIX_PATH=/opt/binutils-2.31
]])
+set(SIGN "")
# Exclude Qt5 tests because our Qt5 is static.
set(EXTRA_CTEST_ARGS "-E Qt5")
diff --git a/Utilities/Release/osx_release.cmake
b/Utilities/Release/osx_release.cmake
index be11d47..ac35872 100644
--- a/Utilities/Release/osx_release.cmake
+++ b/Utilities/Release/osx_release.cmake
@@ -29,5 +29,6 @@ CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE
set(ENV [[
export CMAKE_PREFIX_PATH='/Users/kitware/SDKs/qt-5.6.2-clang-x64'
]])
+set(SIGN "")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.sh.in
b/Utilities/Release/release_cmake.sh.in
index f363b3d..696a3f4 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -150,7 +150,7 @@ for GEN in $generators; do
check_exit_value $? "Create $GEN package" || exit 1
done
-
+@SIGN@
echo "End release"
date
diff --git a/Utilities/Release/win32_release.cmake
b/Utilities/Release/win32_release.cmake
index 974c402..468e5f4 100644
--- a/Utilities/Release/win32_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -45,5 +45,9 @@ set(GIT_EXTRA "git config core.autocrlf true")
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
# Some tests fail spuriously too often.
set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'")
+ set(SIGN "")
+else()
+ string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n")
+ set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256
-td sha256 -d "CMake Windows Installer" cmake-*.msi]])
endif()
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/win64_release.cmake
b/Utilities/Release/win64_release.cmake
index 20529f0..5a93ce6 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -45,5 +45,9 @@ set(GIT_EXTRA "git config core.autocrlf true")
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
# Some tests fail spuriously too often.
set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'")
+ set(SIGN "")
+else()
+ string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n")
+ set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256
-td sha256 -d "CMake Windows Installer"
[Cmake-commits] CMake branch, master, updated. v3.14.3-909-ga8f1527
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 a8f1527ba46b31c5583999391c05421eb86f4973 (commit) from 9d2ea1449265ae6b9ff504ce5a46abe51ea09162 (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=a8f1527ba46b31c5583999391c05421eb86f4973 commit a8f1527ba46b31c5583999391c05421eb86f4973 Author: Kitware Robot AuthorDate: Mon May 13 00:01:10 2019 -0400 Commit: Kitware Robot CommitDate: Mon May 13 00:01:10 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f235157..de5bd39 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 20190512) +set(CMake_VERSION_PATCH 20190513) #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.3-908-g9d2ea14
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 9d2ea1449265ae6b9ff504ce5a46abe51ea09162 (commit) from e329944d098fdaa8f55fdcb90120125efaa51c35 (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=9d2ea1449265ae6b9ff504ce5a46abe51ea09162 commit 9d2ea1449265ae6b9ff504ce5a46abe51ea09162 Author: Kitware Robot AuthorDate: Sun May 12 00:01:04 2019 -0400 Commit: Kitware Robot CommitDate: Sun May 12 00:01:04 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d9cf528..f235157 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 20190511) +set(CMake_VERSION_PATCH 20190512) #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.3-907-ge329944
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 e329944d098fdaa8f55fdcb90120125efaa51c35 (commit) from 741fb95f660c73035a26b572dfcd3d628d324d57 (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=e329944d098fdaa8f55fdcb90120125efaa51c35 commit e329944d098fdaa8f55fdcb90120125efaa51c35 Author: Kitware Robot AuthorDate: Sat May 11 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Sat May 11 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 31a220f..d9cf528 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 20190510) +set(CMake_VERSION_PATCH 20190511) #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.3-906-g741fb95
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 741fb95f660c73035a26b572dfcd3d628d324d57 (commit)
via 30b873c05d6281b865ba08524bb1b90e0afd1ece (commit)
from 62e826d11b91185208363f9c10220b67c75450e5 (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=741fb95f660c73035a26b572dfcd3d628d324d57
commit 741fb95f660c73035a26b572dfcd3d628d324d57
Merge: 62e826d 30b873c
Author: Marc Chevrier
AuthorDate: Fri May 10 13:02:23 2019 +
Commit: Kitware Robot
CommitDate: Fri May 10 09:02:57 2019 -0400
Merge topic 'FindPython-module'
30b873c05d FindPython*: Manage weak link for Python modules
Acked-by: Kitware Robot
Acked-by: Ben Boeckel
Merge-request: !3291
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30b873c05d6281b865ba08524bb1b90e0afd1ece
commit 30b873c05d6281b865ba08524bb1b90e0afd1ece
Author: Marc Chevrier
AuthorDate: Sat May 4 17:09:31 2019 +0200
Commit: Marc Chevrier
CommitDate: Tue May 7 16:37:24 2019 +0200
FindPython*: Manage weak link for Python modules
Add new target Python::Module which take care of platform requirements
for Python module development.
Fixes: #18100
diff --git a/Help/release/dev/FindPython-module.rst
b/Help/release/dev/FindPython-module.rst
new file mode 100644
index 000..79ff9d8
--- /dev/null
+++ b/Help/release/dev/FindPython-module.rst
@@ -0,0 +1,6 @@
+FindPython-module
+-
+
+* Modules :module:`FindPython`, :module:`FindPython2` and :module:`FindPython3`
+ gain a new target (respectively ``Python::Module``, ``Python2::Module``
+ and ``Python3::Module``) which can be used to develop Python modules.
diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake
index c5074e8..36c0611 100644
--- a/Modules/FindPython.cmake
+++ b/Modules/FindPython.cmake
@@ -46,7 +46,11 @@ This module defines the following :ref:`Imported Targets
`
``Python::Compiler``
Python compiler. Target defined if component ``Compiler`` is found.
``Python::Python``
- Python library. Target defined if component ``Development`` is found.
+ Python library for Python embedding. Target defined if component
+ ``Development`` is found.
+``Python::Module``
+ Python library for Python module. Target defined if component ``Development``
+ is found.
``Python::NumPy``
NumPy Python library. Target defined if component ``NumPy`` is found.
@@ -175,9 +179,9 @@ Commands
This module defines the command ``Python_add_library`` (when
:prop_gbl:`CMAKE_ROLE` is ``PROJECT``), which has the same semantics as
-:command:`add_library`, but takes care of Python module naming rules
-(only applied if library is of type ``MODULE``), and adds a dependency to
target
-``Python::Python``::
+:command:`add_library` and adds a dependency to target ``Python::Python`` or,
+when library type is ``MODULE``, to target ``Python::Module`` and takes care of
+Python module naming rules::
Python_add_library (my_module MODULE src1.cpp)
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 6572fb8..6d709e1 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1253,72 +1253,104 @@ if(_${_PYTHON_PREFIX}_CMAKE_ROLE STREQUAL "PROJECT")
endif()
if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
- AND ${_PYTHON_PREFIX}_Development_FOUND AND NOT TARGET
${_PYTHON_PREFIX}::Python)
+ AND ${_PYTHON_PREFIX}_Development_FOUND)
-if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES
"${CMAKE_SHARED_LIBRARY_SUFFIX}$"
-OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG MATCHES
"${CMAKE_SHARED_LIBRARY_SUFFIX}$"
-OR ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE OR
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
- set (_${_PYTHON_PREFIX}_LIBRARY_TYPE SHARED)
-else()
- set (_${_PYTHON_PREFIX}_LIBRARY_TYPE STATIC)
-endif()
-
-add_library (${_PYTHON_PREFIX}::Python ${_${_PYTHON_PREFIX}_LIBRARY_TYPE}
IMPORTED)
-
-set_property (TARGET ${_PYTHON_PREFIX}::Python
- PROPERTY INTERFACE_INCLUDE_DIRECTORIES
"${${_PYTHON_PREFIX}_INCLUDE_DIR}")
-
-if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE AND
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE)
-OR (${_PYTHON_PREFIX}_LIBRARY_DEBUG AND
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG))
- # System manage shared libraries in two parts: import and runtime
- if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND
${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-set_property (TARGET ${_PYTHON_PREFIX}::Python PROPERTY
IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_target_properties
[Cmake-commits] CMake branch, master, updated. v3.14.3-904-g62e826d
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 62e826d11b91185208363f9c10220b67c75450e5 (commit) from 5a2023f904c5da80a4614c133b7d7d8f4f719e96 (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=62e826d11b91185208363f9c10220b67c75450e5 commit 62e826d11b91185208363f9c10220b67c75450e5 Author: Kitware Robot AuthorDate: Fri May 10 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 10 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f2b87cb..31a220f 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 20190509) +set(CMake_VERSION_PATCH 20190510) #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.3-893-g4aace9b
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 4aace9b015cd95209c191139b091acbe0c047864 (commit)
via 2a34d0ac3613101996b4e751bc2653e4cbeaf5b0 (commit)
via 7ddac9512188d1dbfcac76b24957956a197370ad (commit)
via a0d04d8810cb40d7876453df81ff228beb82 (commit)
from afd7df9d1cd9f4aefc3a15e274cd8c6fb01e339c (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=4aace9b015cd95209c191139b091acbe0c047864
commit 4aace9b015cd95209c191139b091acbe0c047864
Merge: afd7df9 2a34d0a
Author: Craig Scott
AuthorDate: Wed May 8 12:49:17 2019 +
Commit: Kitware Robot
CommitDate: Wed May 8 08:49:34 2019 -0400
Merge topic 'ctest-update-version-override'
2a34d0ac36 ctest: Add new variable CTEST_UPDATE_VERSION_OVERRIDE
7ddac95121 Help: cross-ref and wording of docs related to ctest_update()
a0d04d8810 testing: Update terminology in ctest_update tests
Acked-by: Kitware Robot
Acked-by: Zack Galbreath
Merge-request: !3277
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a34d0ac3613101996b4e751bc2653e4cbeaf5b0
commit 2a34d0ac3613101996b4e751bc2653e4cbeaf5b0
Author: Zack Galbreath
AuthorDate: Tue Apr 30 16:12:02 2019 -0400
Commit: Zack Galbreath
CommitDate: Tue May 7 10:45:47 2019 -0400
ctest: Add new variable CTEST_UPDATE_VERSION_OVERRIDE
Set this in a CTest script to explicitly define what the current revision
will be reported as in Update.xml.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 6d93ae9..86dc186 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -583,6 +583,7 @@ Variables for CTest
/variable/CTEST_UPDATE_COMMAND
/variable/CTEST_UPDATE_OPTIONS
/variable/CTEST_UPDATE_VERSION_ONLY
+ /variable/CTEST_UPDATE_VERSION_OVERRIDE
/variable/CTEST_USE_LAUNCHERS
Variables for CPack
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index fab045b..5773176 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -831,6 +831,18 @@ Configuration settings to specify the version control tool
include:
* `CTest Script`_ variable: :variable:`CTEST_UPDATE_VERSION_ONLY`
+.. _`UpdateVersionOverride`:
+
+``UpdateVersionOverride``
+ Specify the current version of your source tree.
+
+ When this variable is set to a non-empty string, CTest will report the value
+ you specified rather than using the update command to discover the current
+ version that is checked out. Use of this variable supersedes
+ ``UpdateVersionOnly``. Like ``UpdateVersionOnly``, using this variable tells
+ CTest not to update the source tree to a different version.
+
+ * `CTest Script`_ variable: :variable:`CTEST_UPDATE_VERSION_OVERRIDE`
Additional configuration settings include:
diff --git a/Help/release/dev/ctest_update_version_override.rst
b/Help/release/dev/ctest_update_version_override.rst
new file mode 100644
index 000..03b47db
--- /dev/null
+++ b/Help/release/dev/ctest_update_version_override.rst
@@ -0,0 +1,7 @@
+CTEST_UPDATE_VERSION_OVERRIDE
+-
+
+* The :command:`ctest_update` command learned to honor a new variable:
+ :variable:`CTEST_UPDATE_VERSION_OVERRIDE`. This can be used to specify
+ the current version of your source tree rather than using the update
+ command to discover the current version that is checked out.
diff --git a/Help/variable/CTEST_UPDATE_VERSION_OVERRIDE.rst
b/Help/variable/CTEST_UPDATE_VERSION_OVERRIDE.rst
new file mode 100644
index 000..39fbaba
--- /dev/null
+++ b/Help/variable/CTEST_UPDATE_VERSION_OVERRIDE.rst
@@ -0,0 +1,5 @@
+CTEST_UPDATE_VERSION_OVERRIDE
+-
+
+Specify the CTest :ref:`UpdateVersionOverride ` setting
+in a :manual:`ctest(1)` dashboard client script.
diff --git a/Source/CTest/cmCTestGlobalVC.cxx b/Source/CTest/cmCTestGlobalVC.cxx
index a2d4d2c..54ebd4f 100644
--- a/Source/CTest/cmCTestGlobalVC.cxx
+++ b/Source/CTest/cmCTestGlobalVC.cxx
@@ -117,3 +117,8 @@ bool cmCTestGlobalVC::WriteXMLUpdates(cmXMLWriter& xml)
return result;
}
+
+void cmCTestGlobalVC::SetNewRevision(std::string const& revision)
+{
+ this->NewRevision = revision;
+}
diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h
index 76377ed..9c57215 100644
--- a/Source/CTest/cmCTestGlobalVC.h
+++ b/Source/CTest/cmCTestGlobalVC.h
@@ -32,6 +32,8 @@ protected:
// Implement cmCTestVC internal API.
bool WriteXMLUpdates(cmXMLWriter& xml) override;
+ void SetNewRevision(std::string const& revision) override;
+
[Cmake-commits] CMake branch, master, updated. v3.14.3-889-gafd7df9
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 afd7df9d1cd9f4aefc3a15e274cd8c6fb01e339c (commit) from fa077acba51393030586aa50f5eff9d6034c5c11 (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=afd7df9d1cd9f4aefc3a15e274cd8c6fb01e339c commit afd7df9d1cd9f4aefc3a15e274cd8c6fb01e339c Author: Kitware Robot AuthorDate: Wed May 8 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Wed May 8 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4e8066a..503bd6e 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 20190507) +set(CMake_VERSION_PATCH 20190508) #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.3-888-gfa077ac
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 fa077acba51393030586aa50f5eff9d6034c5c11 (commit) via be132dc6a6b5a979bdd115880911296e50c961a0 (commit) via 707c180ff0e16753a4053c86fb9ba49e58596c63 (commit) via 50c6204d26136176d95b69d0d399d4d8dd36b373 (commit) via ccb12f93c76d3867e963dbe0777b7dc0ced04025 (commit) via c499eccc5caa91700e033360f31604ecefff0238 (commit) via 521ea77fc03090175feb624cf266ecd5a2f2d904 (commit) via c672a6a4b95b5d5dd08620b3abdf286698c18229 (commit) via 6ced0b97d5fbcaf94f88a5f3062beeb0ad75f186 (commit) via 1527defbfe4ae9cb8f74d5954c790c403727063b (commit) via 8527dbbf4443daf3b43f3b1543192c3a2f26be80 (commit) via 41d262bd3ddf752a28f8e926b19bcc24224f8303 (commit) via 911b97867b72226df7cfab95374a6c2b89d9ffa3 (commit) from 1628e4677a25fc253e94eaae33f6e9aed13ca98a (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=fa077acba51393030586aa50f5eff9d6034c5c11 commit fa077acba51393030586aa50f5eff9d6034c5c11 Merge: be132dc 1527def Author: Brad King AuthorDate: Tue May 7 15:16:12 2019 + Commit: Kitware Robot CommitDate: Tue May 7 11:17:26 2019 -0400 Merge topic 'enforce-explicit-use-of-project' 1527defbfe cmMakefile: Enforce explicit use of project() command Acked-by: Kitware Robot Merge-request: !3245 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be132dc6a6b5a979bdd115880911296e50c961a0 commit be132dc6a6b5a979bdd115880911296e50c961a0 Merge: 707c180 c499ecc Author: Brad King AuthorDate: Tue May 7 15:15:35 2019 + Commit: Kitware Robot CommitDate: Tue May 7 11:16:07 2019 -0400 Merge topic 'findmpi-debug' c499eccc5c FindMPI: Make tests valid C89 by returning 0 521ea77fc0 FindMPI: Correct documentaiton for library version c672a6a4b9 FindMPI: Add error logging Acked-by: Kitware Robot Merge-request: !3289 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=707c180ff0e16753a4053c86fb9ba49e58596c63 commit 707c180ff0e16753a4053c86fb9ba49e58596c63 Merge: 50c6204 41d262b Author: Brad King AuthorDate: Tue May 7 15:15:08 2019 + Commit: Kitware Robot CommitDate: Tue May 7 11:15:18 2019 -0400 Merge topic 'CTestCoverageCollectGCOV-updates' 41d262bd3d CTestCoverageCollectGCOV: run gcov with -x 911b97867b CTestCoverageCollectGCOV: run gcov only once Acked-by: Kitware Robot Merge-request: !3258 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50c6204d26136176d95b69d0d399d4d8dd36b373 commit 50c6204d26136176d95b69d0d399d4d8dd36b373 Merge: ccb12f9 8527dbb Author: Brad King AuthorDate: Tue May 7 15:14:00 2019 + Commit: Kitware Robot CommitDate: Tue May 7 11:14:20 2019 -0400 Merge topic 'use_intel_mkl_blas_intface_on_osX' 8527dbbf44 FindBLAS: Use Intel fortran interface on OS X even with GNU Fortran Acked-by: Kitware Robot Merge-request: !3286 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccb12f93c76d3867e963dbe0777b7dc0ced04025 commit ccb12f93c76d3867e963dbe0777b7dc0ced04025 Merge: 1628e46 6ced0b9 Author: Brad King AuthorDate: Tue May 7 11:13:35 2019 -0400 Commit: Brad King CommitDate: Tue May 7 11:13:35 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c499eccc5caa91700e033360f31604ecefff0238 commit c499eccc5caa91700e033360f31604ecefff0238 Author: Christian Pfeiffer AuthorDate: Mon May 6 18:42:28 2019 +0200 Commit: Christian Pfeiffer CommitDate: Mon May 6 18:42:28 2019 +0200 FindMPI: Make tests valid C89 by returning 0 diff --git a/Modules/FindMPI/libver_mpi.c b/Modules/FindMPI/libver_mpi.c index 18d4a60..d89328a 100644 --- a/Modules/FindMPI/libver_mpi.c +++ b/Modules/FindMPI/libver_mpi.c @@ -16,4 +16,5 @@ int main(int argc, char* argv[]) #else puts(mpilibver_str); #endif + return 0; } diff --git a/Modules/FindMPI/test_mpi.c b/Modules/FindMPI/test_mpi.c index 05cec89..7c96d54 100644 --- a/Modules/FindMPI/test_mpi.c +++ b/Modules/FindMPI/test_mpi.c @@ -34,4 +34,5 @@ int main(int argc, char* argv[]) MPI_Init(, ); MPI_Finalize(); #endif + return 0; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521ea77fc03090175feb624cf266ecd5a2f2d904 commit 521ea77fc03090175feb624cf266ecd5a2f2d904 Author: Christian Pfeiffer AuthorDate: Mon May 6 18:42:02 2019 +0200 Commit: Christian Pfeiffer CommitDate: Mon May 6 18:42:02 2019 +0200 FindMPI: Correct documentaiton for library version diff --git a/Modules/FindMPI.cmake
[Cmake-commits] CMake branch, release, updated. v3.14.3-13-g6ced0b9
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 6ced0b97d5fbcaf94f88a5f3062beeb0ad75f186 (commit) via f83e4359f20034f750729e5a4123de8f54265dd9 (commit) from 6399e2246ffd1b28d6748730abfd893b6642609b (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/cmNinjaNormalTargetGenerator.cxx | 14 ++ 1 file changed, 14 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.3-875-g1628e46
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 1628e4677a25fc253e94eaae33f6e9aed13ca98a (commit)
via f83e4359f20034f750729e5a4123de8f54265dd9 (commit)
from 37bf503db268c41d5a337265300357c76bda34ea (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=1628e4677a25fc253e94eaae33f6e9aed13ca98a
commit 1628e4677a25fc253e94eaae33f6e9aed13ca98a
Merge: 37bf503 f83e435
Author: Brad King
AuthorDate: Tue May 7 15:12:27 2019 +
Commit: Kitware Robot
CommitDate: Tue May 7 11:12:38 2019 -0400
Merge topic 'touch-after-ranlib'
f83e4359f2 Apple: Preserve high resolution mtime for static libraries
Acked-by: Kitware Robot
Merge-request: !3283
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f83e4359f20034f750729e5a4123de8f54265dd9
commit f83e4359f20034f750729e5a4123de8f54265dd9
Author: Gregor Jasny
AuthorDate: Thu May 2 21:37:04 2019 +0200
Commit: Gregor Jasny
CommitDate: Sun May 5 16:14:28 2019 +0200
Apple: Preserve high resolution mtime for static libraries
On macOS ranlib truncates the fractional part of the static achive
file modification time. If the archive and at least one contained
object file were created within the same second this will make look
the archive older than the object file. On subsequent ninja runs
this leads to re-achiving and updating dependent targets.
As a work-around we touch the archive after ranlib.
Closes: #19222
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index cbc0103..becc424 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -537,6 +537,20 @@ std::vector
cmNinjaNormalTargetGenerator::ComputeLinkCmd()
std::string const& linkCmd = mf->GetRequiredDefinition(linkCmdVar);
cmSystemTools::ExpandListArgument(linkCmd, linkCmds);
}
+#ifdef __APPLE__
+ // On macOS ranlib truncates the fractional part of the static archive
+ // file modification time. If the archive and at least one contained
+ // object file were created within the same second this will make look
+ // the archive older than the object file. On subsequent ninja runs this
+ // leads to re-achiving and updating dependent targets.
+ // As a work-around we touch the archive after ranlib (see #19222).
+ {
+std::string cmakeCommand =
+ this->GetLocalGenerator()->ConvertToOutputFormat(
+cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
+linkCmds.push_back(cmakeCommand + " -E touch $TARGET_FILE");
+ }
+#endif
return linkCmds;
}
case cmStateEnums::SHARED_LIBRARY:
---
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 14 ++
1 file changed, 14 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.3-873-g37bf503
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 37bf503db268c41d5a337265300357c76bda34ea (commit) via a6a543ced6b29ed32dc6e944dc0aee63db27f17d (commit) from 9bf6cbc8f78c616087ded2154c6cb7e04ef33db1 (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=37bf503db268c41d5a337265300357c76bda34ea commit 37bf503db268c41d5a337265300357c76bda34ea Merge: 9bf6cbc a6a543c Author: Marc Chevrier AuthorDate: Tue May 7 08:15:14 2019 + Commit: Kitware Robot CommitDate: Tue May 7 04:15:46 2019 -0400 Merge topic 'docs-static-lib-link-options' a6a543ced6 Help: Clarify that link options don't apply to static library targets Acked-by: Kitware Robot Merge-request: !3285 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6a543ced6b29ed32dc6e944dc0aee63db27f17d commit a6a543ced6b29ed32dc6e944dc0aee63db27f17d Author: Craig Scott AuthorDate: Sat May 4 15:17:59 2019 +1000 Commit: Craig Scott CommitDate: Sun May 5 19:05:14 2019 +1000 Help: Clarify that link options don't apply to static library targets diff --git a/Help/command/add_link_options.rst b/Help/command/add_link_options.rst index 1b02bee..a83005b 100644 --- a/Help/command/add_link_options.rst +++ b/Help/command/add_link_options.rst @@ -1,20 +1,25 @@ add_link_options -Add options to the link of shared library, module and executable targets. +Add options to the link step for executable, shared library or module +library targets in the current directory and below that are added after +this command is invoked. .. code-block:: cmake add_link_options( ...) -Adds options to the link step for targets in the current directory and below -that are added after this command is invoked. See documentation of the +This command can be used to add any link options, but alternative commands +exist to add libraries (:command:`target_link_libraries` or +:command:`link_libraries`). See documentation of the :prop_dir:`directory ` and :prop_tgt:`target ` ``LINK_OPTIONS`` properties. -This command can be used to add any options, but alternative commands -exist to add libraries (:command:`target_link_libraries` or -:command:`link_libraries`). +.. note:: + + This command cannot be used to add options for static library targets, + since they do not use a linker. To add archiver or MSVC librarian flags, + see the :prop_tgt:`STATIC_LIBRARY_OPTIONS` target property. Arguments to ``add_link_options`` may use "generator expressions" with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` diff --git a/Help/command/target_link_options.rst b/Help/command/target_link_options.rst index 285455a..b5abbc4 100644 --- a/Help/command/target_link_options.rst +++ b/Help/command/target_link_options.rst @@ -1,7 +1,8 @@ target_link_options --- -Add link options to a target. +Add options to the link step for an executable, shared library or module +library target. .. code-block:: cmake @@ -9,20 +10,25 @@ Add link options to a target. [items1...] [ [items2...] ...]) -Specifies link options to use when linking a given target. The -named must have been created by a command such as +The named must have been created by a command such as :command:`add_executable` or :command:`add_library` and must not be an :ref:`ALIAS target `. +This command can be used to add any link options, but alternative commands +exist to add libraries (:command:`target_link_libraries` or +:command:`link_libraries`). See documentation of the +:prop_dir:`directory ` and +:prop_tgt:`target ` ``LINK_OPTIONS`` properties. + +.. note:: + + This command cannot be used to add options for static library targets, + since they do not use a linker. To add archiver or MSVC librarian flags, + see the :prop_tgt:`STATIC_LIBRARY_OPTIONS` target property. + If ``BEFORE`` is specified, the content will be prepended to the property instead of being appended. -This command can be used to add any options, but -alternative commands exist to add libraries -(:command:`target_link_libraries` and :command:`link_libraries`). -See documentation of the :prop_dir:`directory ` and -:prop_tgt:`target ` ``LINK_OPTIONS`` properties. - The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to specify the scope of the following arguments. ``PRIVATE`` and ``PUBLIC`` items will populate the :prop_tgt:`LINK_OPTIONS` property of --- Summary of changes: Help/command/add_link_options.rst| 17
[Cmake-commits] CMake branch, master, updated. v3.14.3-871-g9bf6cbc
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 9bf6cbc8f78c616087ded2154c6cb7e04ef33db1 (commit) from c6f6e2b3053de02de149e80bd6a0f686a6731f68 (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=9bf6cbc8f78c616087ded2154c6cb7e04ef33db1 commit 9bf6cbc8f78c616087ded2154c6cb7e04ef33db1 Author: Kitware Robot AuthorDate: Tue May 7 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Tue May 7 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6bedd4e..4e8066a 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 20190506) +set(CMake_VERSION_PATCH 20190507) #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.3-870-gc6f6e2b
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 c6f6e2b3053de02de149e80bd6a0f686a6731f68 (commit) via aae79c2d7057fbf20519db857cca6ba3c896a5ed (commit) via 6399e2246ffd1b28d6748730abfd893b6642609b (commit) via 2951d74d35b7538bf91e38128ea2864772ba (commit) via 34c0293532768e2092fd9fa2ef75e193c04c25f3 (commit) from f0185ff14a1c25dc603e207fbf3cc73457c5990c (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=c6f6e2b3053de02de149e80bd6a0f686a6731f68 commit c6f6e2b3053de02de149e80bd6a0f686a6731f68 Merge: aae79c2 6399e22 Author: Brad King AuthorDate: Mon May 6 09:40:12 2019 -0400 Commit: Brad King CommitDate: Mon May 6 09:40:12 2019 -0400 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aae79c2d7057fbf20519db857cca6ba3c896a5ed commit aae79c2d7057fbf20519db857cca6ba3c896a5ed Merge: f0185ff 34c0293 Author: Brad King AuthorDate: Mon May 6 13:32:45 2019 + Commit: Kitware Robot CommitDate: Mon May 6 09:33:45 2019 -0400 Merge topic 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' 34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly Acked-by: Kitware Robot Merge-request: !3287 --- Summary of changes: Modules/FindPython/Support.cmake | 9 ++--- 1 file changed, 6 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.14.3-11-g6399e22
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 6399e2246ffd1b28d6748730abfd893b6642609b (commit) via 2951d74d35b7538bf91e38128ea2864772ba (commit) via 275b6b3194e09a77247dc863ad5259cee316d6dc (commit) via 34c0293532768e2092fd9fa2ef75e193c04c25f3 (commit) from 463e20c5c6a5c23aeedbe6cf5d163592e783a6d7 (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/FindPython/Support.cmake | 9 ++--- Source/cmCoreTryCompile.cxx | 9 - 2 files changed, 14 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.3-865-gf0185ff
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 f0185ff14a1c25dc603e207fbf3cc73457c5990c (commit)
via 275b6b3194e09a77247dc863ad5259cee316d6dc (commit)
from 1820c7e780e827a509a340835229d7075f5d1d1e (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=f0185ff14a1c25dc603e207fbf3cc73457c5990c
commit f0185ff14a1c25dc603e207fbf3cc73457c5990c
Merge: 1820c7e 275b6b3
Author: Brad King
AuthorDate: Mon May 6 13:32:16 2019 +
Commit: Kitware Robot
CommitDate: Mon May 6 09:32:25 2019 -0400
Merge topic 'fix_ios_try_compile'
275b6b3194 iOS: Fix try_compile FILE_COPY not to fail
Acked-by: Kitware Robot
Merge-request: !3272
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=275b6b3194e09a77247dc863ad5259cee316d6dc
commit 275b6b3194e09a77247dc863ad5259cee316d6dc
Author: Alexandru Croitor
AuthorDate: Tue Apr 30 12:41:06 2019 +0200
Commit: Brad King
CommitDate: Mon May 6 09:23:27 2019 -0400
iOS: Fix try_compile FILE_COPY not to fail
When building for iOS, the compiled target is placed into a bundle.
If a single-configuration generator is used, like Makefiles or Ninja,
the try_compile FILE_COPY behavior fails to find the bundle, because
it only looks for the bundle inside a Debug subfolder (presumably
to support a multi-configuration generator like Xcode).
Consider looking for the bundle in the root try_compile folder, as
well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION.
Closes: #19211
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 3892011..037d415 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -1040,7 +1040,14 @@ void cmCoreTryCompile::FindOutputFile(const std::string&
targetName,
}
searchDirs.emplace_back("/Debug");
#if defined(__APPLE__)
- std::string app = "/Debug/" + targetName + ".app";
+ std::string app = "/" + targetName + ".app";
+ if (config && config[0]) {
+std::string tmp = "/";
+tmp += config + app;
+searchDirs.push_back(std::move(tmp));
+ }
+ std::string tmp = "/Debug" + app;
+ searchDirs.emplace_back(std::move(tmp));
searchDirs.push_back(std::move(app));
#endif
searchDirs.emplace_back("/Development");
---
Summary of changes:
Source/cmCoreTryCompile.cxx | 9 -
1 file changed, 8 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.14.3-863-g1820c7e
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 1820c7e780e827a509a340835229d7075f5d1d1e (commit)
via b9ee95fe5e621037f415de675eb378504170a056 (commit)
via e3919bae17d3442e18b5ec1f4a1ae994c87c455b (commit)
via 541f079bd7ba7f141218ed93177af4d848e516fa (commit)
from 0f27e7d165c96f2c3ada1695df4f6cfaa44afe51 (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=1820c7e780e827a509a340835229d7075f5d1d1e
commit 1820c7e780e827a509a340835229d7075f5d1d1e
Merge: b9ee95f e3919ba
Author: Brad King
AuthorDate: Mon May 6 13:18:21 2019 +
Commit: Kitware Robot
CommitDate: Mon May 6 09:19:38 2019 -0400
Merge topic 'SWIG'
e3919bae17 UseSWIG: Manage alternate library name
Acked-by: Kitware Robot
Merge-request: !3241
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9ee95fe5e621037f415de675eb378504170a056
commit b9ee95fe5e621037f415de675eb378504170a056
Merge: 0f27e7d 541f079
Author: Brad King
AuthorDate: Mon May 6 13:18:02 2019 +
Commit: Kitware Robot
CommitDate: Mon May 6 09:18:28 2019 -0400
Merge topic 'findice-clang-cl'
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID
Acked-by: Kitware Robot
Merge-request: !3284
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3919bae17d3442e18b5ec1f4a1ae994c87c455b
commit e3919bae17d3442e18b5ec1f4a1ae994c87c455b
Author: Marc Chevrier
AuthorDate: Wed Apr 17 12:23:15 2019 +0200
Commit: Marc Chevrier
CommitDate: Fri May 3 18:20:17 2019 +0200
UseSWIG: Manage alternate library name
Manage alternate library name by passing -interface
for python language or -dllimport for CSharp language
to the SWIG compiler.
Fixes: #18771
diff --git a/Help/release/dev/UseSWIG-alternate-library-name.rst
b/Help/release/dev/UseSWIG-alternate-library-name.rst
new file mode 100644
index 000..8e58b8d
--- /dev/null
+++ b/Help/release/dev/UseSWIG-alternate-library-name.rst
@@ -0,0 +1,7 @@
+UseSWIG-alternate-library-name
+--
+
+* The :module:`UseSWIG` module learned to manage alternate library names by
+ passing ``-interface `` for ``python`` language or
+ ``-dllimport `` for ``CSharp`` language to the ``SWIG``
+ compiler.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 18ea55c..c136b05 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -466,7 +466,14 @@ function(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
if(NOT ("-dllimport" IN_LIST swig_source_file_flags OR "-dllimport"
IN_LIST SWIG_MODULE_${name}_EXTRA_FLAGS))
# This makes sure that the name used in the generated DllImport
# matches the library name created by CMake
- list (APPEND SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport" "${name}")
+ list (APPEND SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport"
"$$")
+endif()
+ endif()
+ if (SWIG_MODULE_${name}_LANGUAGE STREQUAL "PYTHON" AND NOT
SWIG_MODULE_${name}_NOPROXY)
+if(NOT ("-interface" IN_LIST swig_source_file_flags OR "-interface"
IN_LIST SWIG_MODULE_${name}_EXTRA_FLAGS))
+ # This makes sure that the name used in the proxy code
+ # matches the library name created by CMake
+ list (APPEND SWIG_MODULE_${name}_EXTRA_FLAGS "-interface"
"$$")
endif()
endif()
list (APPEND swig_extra_flags ${SWIG_MODULE_${name}_EXTRA_FLAGS})
diff --git a/Tests/UseSWIG/AlternateLibraryName/CMakeLists.txt
b/Tests/UseSWIG/AlternateLibraryName/CMakeLists.txt
new file mode 100644
index 000..a2c239c
--- /dev/null
+++ b/Tests/UseSWIG/AlternateLibraryName/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.14...3.15)
+
+project(TestAlternateLibraryName CXX)
+
+include(CTest)
+
+find_package(SWIG REQUIRED)
+include(${SWIG_USE_FILE})
+
+find_package(Python2 REQUIRED COMPONENTS Interpreter Development)
+
+# Path separator
+if (WIN32)
+ set (PS "$")
+else()
+ set (PS ":")
+endif()
+
+unset(CMAKE_SWIG_FLAGS)
+
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/../example.i" PROPERTY
CPLUSPLUS ON)
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/../example.i" PROPERTY
COMPILE_OPTIONS -includeall)
+
+swig_add_library(example_python
+ LANGUAGE python
+ SOURCES ../example.i ../example.cxx)
+set_target_properties (example_python PROPERTIES
+ INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/.."
+ SWIG_USE_TARGET_INCLUDE_DIRECTORIES TRUE)
+target_link_libraries(example_python PRIVATE Python2::Python)
+
+
+add_test (NAME AlternateLibraryName.example1
+ COMMAND "${CMAKE_COMMAND}" -E env
[Cmake-commits] CMake branch, master, updated. v3.14.3-859-g0f27e7d
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 0f27e7d165c96f2c3ada1695df4f6cfaa44afe51 (commit) from 3771a75d58c253efdbc4579a098e318649aace2b (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=0f27e7d165c96f2c3ada1695df4f6cfaa44afe51 commit 0f27e7d165c96f2c3ada1695df4f6cfaa44afe51 Author: Kitware Robot AuthorDate: Mon May 6 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Mon May 6 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9d3f09f..6bedd4e 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 20190505) +set(CMake_VERSION_PATCH 20190506) #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.3-858-g3771a75
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 3771a75d58c253efdbc4579a098e318649aace2b (commit) from d3a0582b0c0095ab95c3610ba93f3d38b5a13620 (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=3771a75d58c253efdbc4579a098e318649aace2b commit 3771a75d58c253efdbc4579a098e318649aace2b Author: Kitware Robot AuthorDate: Sun May 5 00:01:03 2019 -0400 Commit: Kitware Robot CommitDate: Sun May 5 00:01:03 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 50edb3c..9d3f09f 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 20190504) +set(CMake_VERSION_PATCH 20190505) #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.3-857-gd3a0582
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 d3a0582b0c0095ab95c3610ba93f3d38b5a13620 (commit) from 186ca170da51d64a50bb15bfd067ca9b4c987327 (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=d3a0582b0c0095ab95c3610ba93f3d38b5a13620 commit d3a0582b0c0095ab95c3610ba93f3d38b5a13620 Author: Kitware Robot AuthorDate: Sat May 4 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Sat May 4 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a6c9d01..50edb3c 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 20190503) +set(CMake_VERSION_PATCH 20190504) #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.3-856-g186ca17
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 186ca170da51d64a50bb15bfd067ca9b4c987327 (commit)
via 6f242acfcb72881d184f5b2468fd4ddcadce01d8 (commit)
via 9713154cf609691dfe9b8484c16cc034ea52d799 (commit)
via cd285b749615c64e72ddadda0ba014c91829529c (commit)
via c85524a94ace9ee400229fede179a605b1c144e3 (commit)
via c474fb2777ea3e675237fccf23f64fe37371a5b0 (commit)
via c846dbf89ee5b11a74dceb1c19fd7472eb8b075d (commit)
via 6ad699358b6b421da6c49cf540b30eb8b0a3a996 (commit)
from 323c4fb989e0259c733f5a34044c693667a31842 (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=186ca170da51d64a50bb15bfd067ca9b4c987327
commit 186ca170da51d64a50bb15bfd067ca9b4c987327
Merge: 6f242ac c85524a
Author: Brad King
AuthorDate: Fri May 3 15:48:33 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:48:46 2019 -0400
Merge topic 'std-pipes-always'
c85524a94a Ensure stdin, stdout, and stderr pipes are always open
Acked-by: Kitware Robot
Acked-by: Kyle Edwards
Merge-request: !3282
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f242acfcb72881d184f5b2468fd4ddcadce01d8
commit 6f242acfcb72881d184f5b2468fd4ddcadce01d8
Merge: 9713154 c474fb2
Author: Brad King
AuthorDate: Fri May 3 15:46:05 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:46:25 2019 -0400
Merge topic 'cpack-ifw-stylesheet'
c474fb2777 CPack/IFW: Add StyleSheet field
Acked-by: Kitware Robot
Merge-request: !3270
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9713154cf609691dfe9b8484c16cc034ea52d799
commit 9713154cf609691dfe9b8484c16cc034ea52d799
Merge: cd285b7 6ad6993
Author: Brad King
AuthorDate: Fri May 3 15:45:22 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:45:32 2019 -0400
Merge topic 'jobs-positive-value'
6ad699358b cmake: --build -j should not accept 0.
Acked-by: Kitware Robot
Merge-request: !3255
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd285b749615c64e72ddadda0ba014c91829529c
commit cd285b749615c64e72ddadda0ba014c91829529c
Merge: 323c4fb c846dbf
Author: Brad King
AuthorDate: Fri May 3 15:43:42 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:43:50 2019 -0400
Merge topic 'DetermineCompilerId-versioned-llvm-for-vs'
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual
Studio.
Acked-by: Kitware Robot
Merge-request: !3281
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c85524a94ace9ee400229fede179a605b1c144e3
commit c85524a94ace9ee400229fede179a605b1c144e3
Author: Brad King
AuthorDate: Thu May 2 11:11:28 2019 -0400
Commit: Brad King
CommitDate: Thu May 2 14:34:58 2019 -0400
Ensure stdin, stdout, and stderr pipes are always open
On non-Windows platforms libuv assumes that file descriptors 0-2 are
always used for standard pipes and never for anything else. Otherwise,
libuv may re-use one of these descriptors and then fail an assertion
when closing it. Similarly, On Windows platforms our ConsoleBuf
implementation assumes that the standard handles are always open.
If CMake is run with any standard pipes closed, open them with
`/dev/null` or `NUL` to satisfy these assumptions.
Fixes: #19219
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 3ceb824..58b9e70 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -98,6 +98,7 @@ static void cpackProgressCallback(const std::string& message,
float /*unused*/)
// this is CPack.
int main(int argc, char const* const* argv)
{
+ cmSystemTools::EnsureStdPipes();
#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
// Replace streambuf so we can output Unicode to console
cmsys::ConsoleBuf::Manager consoleOut(std::cout);
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 745c6bb..7caed0c 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -67,6 +67,7 @@ void onsig(int /*unused*/)
int main(int argc, char const* const* argv)
{
+ cmSystemTools::EnsureStdPipes();
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 8d9a50c..c9ebba8 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -55,6 +55,7 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin);
int main(int
[Cmake-commits] CMake branch, master, updated. v3.14.3-848-g323c4fb
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 323c4fb989e0259c733f5a34044c693667a31842 (commit)
via 6e5ccabe9ba1b92bb5244683c4315964b01e0df7 (commit)
via 1f4c9aa7d2c93f2377a6d1cb4cf2c1137466e927 (commit)
from 784dd90fd40ff3cdc9fb44d37c0eef992ed05a92 (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=323c4fb989e0259c733f5a34044c693667a31842
commit 323c4fb989e0259c733f5a34044c693667a31842
Merge: 784dd90 6e5ccab
Author: Brad King
AuthorDate: Fri May 3 15:42:37 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:42:47 2019 -0400
Merge topic 'genex-TARGET_FILE_BASE_NAME-manage-postfix'
6e5ccabe9b Genex: Update $: take care of POSTFIX
1f4c9aa7d2 Refactor: introduce method cmGeneratorTarget::GetFilePostfix
Acked-by: Kitware Robot
Merge-request: !3267
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e5ccabe9ba1b92bb5244683c4315964b01e0df7
commit 6e5ccabe9ba1b92bb5244683c4315964b01e0df7
Author: Marc Chevrier
AuthorDate: Thu Apr 25 18:48:43 2019 +0200
Commit: Marc Chevrier
CommitDate: Thu May 2 11:01:10 2019 +0200
Genex: Update $: take care of POSTFIX
This capability complement MR !3190 and !3207
and is also needed to solve issue #18771.
diff --git a/Help/manual/cmake-generator-expressions.7.rst
b/Help/manual/cmake-generator-expressions.7.rst
index 3dc3221..ce62893 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -404,16 +404,25 @@ Target-Dependent Queries
:prop_tgt:`LIBRARY_OUTPUT_NAME_` and
:prop_tgt:`RUNTIME_OUTPUT_NAME_`.
+ The :prop_tgt:`_POSTFIX` and :prop_tgt:`DEBUG_POSTFIX` target
+ properties can also be considered.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
Prefix of main file where ``tgt`` is the name of a target.
+ See also the :prop_tgt:`PREFIX` target property.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
Suffix of main file where ``tgt`` is the name of a target.
+ The suffix corresponds to the file extension (such as ".so" or ".exe").
+
+ See also the :prop_tgt:`SUFFIX` target property.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
@@ -435,16 +444,27 @@ Target-Dependent Queries
:prop_tgt:`ARCHIVE_OUTPUT_NAME_` and
:prop_tgt:`LIBRARY_OUTPUT_NAME_`.
+ The :prop_tgt:`_POSTFIX` and :prop_tgt:`DEBUG_POSTFIX` target
+ properties can also be considered.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
Prefix of file used to link where ``tgt`` is the name of a target.
+ See also the :prop_tgt:`PREFIX` and :prop_tgt:`IMPORT_PREFIX` target
+ properties.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
Suffix of file used to link where ``tgt`` is the name of a target.
+ The suffix corresponds to the file extension (such as ".so" or ".lib").
+
+ See also the :prop_tgt:`SUFFIX` and :prop_tgt:`IMPORT_SUFFIX` target
+ properties.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
@@ -475,6 +495,9 @@ Target-Dependent Queries
See also the :prop_tgt:`PDB_NAME` target property and its configuration
specific variant :prop_tgt:`PDB_NAME_`.
+ The :prop_tgt:`_POSTFIX` and :prop_tgt:`DEBUG_POSTFIX` target
+ properties can also be considered.
+
Note that ``tgt`` is not added as a dependency of the target this
expression is evaluated on.
``$``
diff --git a/Source/cmGeneratorExpressionNode.cxx
b/Source/cmGeneratorExpressionNode.cxx
index 8803830..a207b5f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -2202,7 +2202,8 @@ struct
TargetOutputNameArtifactResultGetter
const GeneratorExpressionContent* /*unused*/)
{
return target->GetOutputName(context->Config,
- cmStateEnums::RuntimeBinaryArtifact);
+ cmStateEnums::RuntimeBinaryArtifact) +
+ target->GetFilePostfix(context->Config);
}
};
@@ -2224,7 +2225,8 @@ struct
TargetOutputNameArtifactResultGetter
target->HasImportLibrary(context->Config)
? cmStateEnums::ImportLibraryArtifact
: cmStateEnums::RuntimeBinaryArtifact;
-return target->GetOutputName(context->Config, artifact);
+return
[Cmake-commits] CMake branch, master, updated. v3.14.3-845-g784dd90
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 784dd90fd40ff3cdc9fb44d37c0eef992ed05a92 (commit)
via 3dbec532555eb4d088f35b4a2593ca1cc247dab0 (commit)
from 713f1a0e7da7c76b0502b4ee885a74eb2e07c3b4 (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=784dd90fd40ff3cdc9fb44d37c0eef992ed05a92
commit 784dd90fd40ff3cdc9fb44d37c0eef992ed05a92
Merge: 713f1a0 3dbec53
Author: Brad King
AuthorDate: Fri May 3 15:29:41 2019 +
Commit: Kitware Robot
CommitDate: Fri May 3 11:30:04 2019 -0400
Merge topic 'memorize_cxx_compilers_with_full_CXX14_support'
3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support
Acked-by: Kitware Robot
Merge-request: !3280
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dbec532555eb4d088f35b4a2593ca1cc247dab0
commit 3dbec532555eb4d088f35b4a2593ca1cc247dab0
Author: Robert Maynard
AuthorDate: Mon Apr 29 17:20:14 2019 -0400
Commit: Robert Maynard
CommitDate: Thu May 2 10:23:25 2019 -0400
CompileFeatures: Record when compilers gained full CXX14 support
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++14 feature support when the
running compiler is known to have all features.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 6fb0200..c116078 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -29,9 +29,11 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
endif()
set(_clang_version_std17 5.0)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 1253291..fcaaeab 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -38,6 +38,10 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+ set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
+endif()
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 032071c..44b0c3d 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -40,6 +40,16 @@ else()
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
endif()
+ # While full C++14 support was first introduced in Intel 17,
+ # Intel 18.0.0-4 don't have full support as they broke
+ # support for cxx_relaxed_constexpr.
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.4)
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
+ elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.0.0
+AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
+ endif()
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
---
Summary of changes:
Modules/Compiler/Clang-CXX.cmake | 2 ++
Modules/Compiler/GNU-CXX.cmake | 4
Modules/Compiler/Intel-CXX.cmake | 10 ++
3 files changed, 16 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.3-843-g713f1a0
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 713f1a0e7da7c76b0502b4ee885a74eb2e07c3b4 (commit) from ce79364581643700ab88ee4c442e0cf1736c926e (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=713f1a0e7da7c76b0502b4ee885a74eb2e07c3b4 commit 713f1a0e7da7c76b0502b4ee885a74eb2e07c3b4 Author: Kitware Robot AuthorDate: Fri May 3 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 3 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1b34ba5..a6c9d01 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 20190502) +set(CMake_VERSION_PATCH 20190503) #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.3-842-gce79364
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 ce79364581643700ab88ee4c442e0cf1736c926e (commit)
via eef1dacf51ea32b98596608e6d4dab0f18b1457b (commit)
via e08efc36eb17992f4bb8697b4173ede913aafab4 (commit)
via 4783b842baf0e081b3385b00d696b6635eee655d (commit)
via 5f5e3062cf2394f4e28e078817e074892e9c508d (commit)
via 94c5fa5f7a189c1a99891bbacc6a3b291f399d7a (commit)
via 101135069425a1f3af85aa7d1fedf2656d9674f0 (commit)
via d9beea0ccacc8c3cdc14b71b660a73a458f09650 (commit)
via 3d856eba16fae90f66dd142f91c21d4121b760d0 (commit)
via 9e1df5df5479b78d65d37e58b5cd0c93d70838ae (commit)
via 36f36d6a49976527a13a77d11fcdc5c3f5ba (commit)
via 3f57787dffa629b7c10ca2a02229b7e1a4bfe1f9 (commit)
via 20d7c5631e88d80cb683a5e120c0c1e1f077945a (commit)
via abd62201bd7d10f8eb27229ac3f5e55d52d0659e (commit)
via f2c8ff825995c1425a134e24eee6c4fb73c3a6b2 (commit)
from 3b4315dc23bdedb3163a0c84b9fdbae2324470c6 (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=ce79364581643700ab88ee4c442e0cf1736c926e
commit ce79364581643700ab88ee4c442e0cf1736c926e
Merge: eef1dac 4783b84
Author: Brad King
AuthorDate: Thu May 2 13:46:32 2019 +
Commit: Kitware Robot
CommitDate: Thu May 2 09:46:39 2019 -0400
Merge topic 'ios_fixes'
4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not
defined
5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs
94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values
1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file
Acked-by: Kitware Robot
Merge-request: !3273
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eef1dacf51ea32b98596608e6d4dab0f18b1457b
commit eef1dacf51ea32b98596608e6d4dab0f18b1457b
Merge: e08efc3 d9beea0
Author: Brad King
AuthorDate: Thu May 2 13:43:52 2019 +
Commit: Kitware Robot
CommitDate: Thu May 2 09:44:13 2019 -0400
Merge topic 'cpackrpm.debug'
d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not
CPACK_RPM_PACKAGE_DEBUG
Acked-by: Kitware Robot
Merge-request: !3271
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e08efc36eb17992f4bb8697b4173ede913aafab4
commit e08efc36eb17992f4bb8697b4173ede913aafab4
Merge: 3b4315d 3d856eb
Author: Brad King
AuthorDate: Thu May 2 13:42:59 2019 +
Commit: Kitware Robot
CommitDate: Thu May 2 09:43:09 2019 -0400
Merge topic 'genex-code-cleanup'
3d856eba16 cmGeneratorExpressionNode: refactor TargetPropertyNode
9e1df5df54 cmGeneratorExpressionNode: use ctor arguments instead of macro
36f36d6a49 cmGeneratorExpressionNode: add VersionNode
3f57787dff cmGeneratorExpressionNode: remove structs CompilerId*,
CompilerVersion*
20d7c5631e cmGeneratorExpressionNode: add CharacterNode
abd62201bd cmGeneratorExpressionNode: simplify code in EqualNode
f2c8ff8259 cmGeneratorExpressionNode: Simplify static string constant
Acked-by: Kitware Robot
Merge-request: !3234
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4783b842baf0e081b3385b00d696b6635eee655d
commit 4783b842baf0e081b3385b00d696b6635eee655d
Author: Alexandru Croitor
AuthorDate: Tue Apr 30 19:10:08 2019 +0200
Commit: Alexandru Croitor
CommitDate: Tue Apr 30 19:10:08 2019 +0200
iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined
This allows overriding them in a toolchain file.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 27e5e81..7e02814 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -6,9 +6,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME
STREQUAL "tvOS" OR CMAK
endif()
list(APPEND CMAKE_FIND_ROOT_PATH "${_CMAKE_OSX_SYSROOT_PATH}")
- set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+ if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ endif()
+ if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+ endif()
+ if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+ endif()
endif()
# Darwin versions:
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f5e3062cf2394f4e28e078817e074892e9c508d
commit 5f5e3062cf2394f4e28e078817e074892e9c508d
Author: Alexandru Croitor
AuthorDate:
[Cmake-commits] CMake branch, master, updated. v3.14.3-827-g3b4315d
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 3b4315dc23bdedb3163a0c84b9fdbae2324470c6 (commit)
via 1ee21c6ec5ef783d2b960fc3e13161582cf22e10 (commit)
via b7b66919a3952a3a2c31d659fcbe3bebf7e5887e (commit)
via cab5471a7ba0f45273f293104f5d00d1af8284ac (commit)
via 75643755a1492f3d07e811541207769341eb2b9e (commit)
via 615fb2633cd6f4e7543eb172e10f32f09cad6d88 (commit)
via 30c98db61be3e0079305514b98b2d3d07b6877cc (commit)
from 3ee16ef31b78ff73d7a0c569fdb87b41f2a5e97d (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=3b4315dc23bdedb3163a0c84b9fdbae2324470c6
commit 3b4315dc23bdedb3163a0c84b9fdbae2324470c6
Merge: 1ee21c6 7564375
Author: Brad King
AuthorDate: Thu May 2 13:41:59 2019 +
Commit: Kitware Robot
CommitDate: Thu May 2 09:42:08 2019 -0400
Merge topic 'code-cleanup-3'
75643755a1 cmGlobalVisualStudioGenerator: remove redundant variables
615fb2633c cmGlobalVisualStudioGenerator: use cmJoin to join the filenames
30c98db61b cmGlobalVisualStudioGenerator: use auto instead of iterator types
Acked-by: Kitware Robot
Merge-request: !3257
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee21c6ec5ef783d2b960fc3e13161582cf22e10
commit 1ee21c6ec5ef783d2b960fc3e13161582cf22e10
Merge: 3ee16ef b7b6691
Author: Brad King
AuthorDate: Thu May 2 13:33:23 2019 +
Commit: Kitware Robot
CommitDate: Thu May 2 09:33:33 2019 -0400
Merge topic 'fix-swiftmix-test-for-xcode-10.2'
b7b66919a3 SwiftMix: properly export SwiftMain method
cab5471a7b SwiftMix: Get rid of pointer types mismatch warning
Acked-by: Kitware Robot
Merge-request: !3279
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7b66919a3952a3a2c31d659fcbe3bebf7e5887e
commit b7b66919a3952a3a2c31d659fcbe3bebf7e5887e
Author: Gregor Jasny
AuthorDate: Wed May 1 13:24:34 2019 +0200
Commit: Gregor Jasny
CommitDate: Wed May 1 13:30:14 2019 +0200
SwiftMix: properly export SwiftMain method
diff --git a/Tests/SwiftMix/CMakeLists.txt b/Tests/SwiftMix/CMakeLists.txt
index 5e50470..6d8e48b 100644
--- a/Tests/SwiftMix/CMakeLists.txt
+++ b/Tests/SwiftMix/CMakeLists.txt
@@ -3,3 +3,4 @@ project(SwiftMix C Swift)
add_executable(SwiftMix CMain.c ObjCMain.m SwiftMain.swift ObjC-Swift.h)
set_property(TARGET SwiftMix PROPERTY
XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "ObjC-Swift.h")
+target_compile_options(SwiftMix PRIVATE
"$<$:-Werror=objc-method-access>")
diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index a4a0a62..d9c8cd7 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -1,7 +1,7 @@
import Foundation
@objc class SwiftMainClass : NSObject {
- class func SwiftMain() -> Int32 {
+ @objc class func SwiftMain() -> Int32 {
dump("Hello World!");
return 0;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cab5471a7ba0f45273f293104f5d00d1af8284ac
commit cab5471a7ba0f45273f293104f5d00d1af8284ac
Author: Gregor Jasny
AuthorDate: Wed May 1 13:23:23 2019 +0200
Commit: Gregor Jasny
CommitDate: Wed May 1 13:30:14 2019 +0200
SwiftMix: Get rid of pointer types mismatch warning
diff --git a/Tests/SwiftMix/CMain.c b/Tests/SwiftMix/CMain.c
index 8877da4..519058e 100644
--- a/Tests/SwiftMix/CMain.c
+++ b/Tests/SwiftMix/CMain.c
@@ -1,5 +1,5 @@
-extern int ObjCMain(int argc, char const* const argv[]);
-int main(int argc, char* argv[])
+extern int ObjCMain(void);
+int main(void)
{
- return ObjCMain(argc, argv);
+ return ObjCMain();
}
diff --git a/Tests/SwiftMix/ObjCMain.m b/Tests/SwiftMix/ObjCMain.m
index 20f0bf1..afc92438 100644
--- a/Tests/SwiftMix/ObjCMain.m
+++ b/Tests/SwiftMix/ObjCMain.m
@@ -1,4 +1,4 @@
#import "SwiftMix-Swift.h"
-int ObjCMain(int argc, char const* const argv[]) {
+int ObjCMain(void) {
return [SwiftMainClass SwiftMain];
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75643755a1492f3d07e811541207769341eb2b9e
commit 75643755a1492f3d07e811541207769341eb2b9e
Author: Leonid Pospelov
AuthorDate: Wed Apr 24 17:18:11 2019 +0300
Commit: Leonid Pospelov
CommitDate: Wed Apr 24 17:18:11 2019 +0300
cmGlobalVisualStudioGenerator: remove redundant variables
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index d457cc3..cd0355f 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -203,9 +203,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
// Now make all targets depend on the
[Cmake-commits] CMake branch, master, updated. v3.14.3-820-g3ee16ef
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 3ee16ef31b78ff73d7a0c569fdb87b41f2a5e97d (commit) from fb325daa55b1bd6aa2b2b7f2c615214378224938 (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=3ee16ef31b78ff73d7a0c569fdb87b41f2a5e97d commit 3ee16ef31b78ff73d7a0c569fdb87b41f2a5e97d Author: Kitware Robot AuthorDate: Thu May 2 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Thu May 2 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index dd166e0..1b34ba5 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 20190501) +set(CMake_VERSION_PATCH 20190502) #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.3-819-gfb325da
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 fb325daa55b1bd6aa2b2b7f2c615214378224938 (commit)
via 13b73ff65f2a6107f1257bac92df94fed31c25f8 (commit)
via 34d67a24058477dfb0ec69faca7847dd6b1847be (commit)
via 8d45a2ffe0439187ba3873e81ebf894906745bc5 (commit)
via 4d78bea5dfa53958a1317f655b1e761e457a54c7 (commit)
via 0b684524ac657b03ea233e039aad5c8e43a52f2c (commit)
via 01a4eec446496f52146949a959fab2f1fab6e654 (commit)
from a6c78c049ab01dbfee34b639364d8b1b05adeb0d (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=fb325daa55b1bd6aa2b2b7f2c615214378224938
commit fb325daa55b1bd6aa2b2b7f2c615214378224938
Merge: 13b73ff 4d78bea
Author: Brad King
AuthorDate: Wed May 1 16:40:47 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 12:42:29 2019 -0400
Merge topic 'IAR_6_x_fix'
4d78bea5df IAR: Fail early in case of IAR ARM 4.XX
0b684524ac IAR: Fix building with IAR ARM 6.X
Acked-by: Kitware Robot
Merge-request: !3263
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13b73ff65f2a6107f1257bac92df94fed31c25f8
commit 13b73ff65f2a6107f1257bac92df94fed31c25f8
Merge: 34d67a2 01a4eec
Author: Brad King
AuthorDate: Wed May 1 16:40:45 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 12:41:30 2019 -0400
Merge topic 'iar-binutils'
01a4eec446 IAR: Changes required for Linux
Acked-by: Kitware Robot
Merge-request: !3262
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34d67a24058477dfb0ec69faca7847dd6b1847be
commit 34d67a24058477dfb0ec69faca7847dd6b1847be
Merge: a6c78c0 8d45a2f
Author: Brad King
AuthorDate: Wed May 1 16:39:37 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 12:40:15 2019 -0400
Merge topic 'memorize_cxx_compilers_with_full_CXX11_support'
8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support
Acked-by: Kitware Robot
Merge-request: !3232
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d45a2ffe0439187ba3873e81ebf894906745bc5
commit 8d45a2ffe0439187ba3873e81ebf894906745bc5
Author: Robert Maynard
AuthorDate: Tue Apr 16 14:11:20 2019 -0400
Commit: Robert Maynard
CommitDate: Mon Apr 29 17:18:45 2019 -0400
CompileFeatures: Record when compilers gained full CXX11 support
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++11 feature support when the
running compiler is known to have all features.
diff --git a/Modules/Compiler/AppleClang-CXX.cmake
b/Modules/Compiler/AppleClang-CXX.cmake
index d34d494..2042360 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -28,4 +28,9 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
endif()
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
+endif()
+
__compiler_check_default_language_standard(CXX 4.0 98)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 34ffd66..6fb0200 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -17,9 +17,10 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
+set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 7202607..1253291 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -17,15 +17,19 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
+ set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
- set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
# 4.3 supports 0x variants
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION
[Cmake-commits] CMake branch, master, updated. v3.14.3-812-ga6c78c0
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 a6c78c049ab01dbfee34b639364d8b1b05adeb0d (commit) via 463e20c5c6a5c23aeedbe6cf5d163592e783a6d7 (commit) via d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30 (commit) via b947113b429b80bd6b3b14a62d2123718308e14a (commit) from 6dbc12df684e146d15e9d5f9a68972f0a2196e10 (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=a6c78c049ab01dbfee34b639364d8b1b05adeb0d commit a6c78c049ab01dbfee34b639364d8b1b05adeb0d Merge: 6dbc12d 463e20c Author: Brad King AuthorDate: Wed May 1 12:03:46 2019 -0400 Commit: Brad King CommitDate: Wed May 1 12:03:46 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, release, updated. v3.14.3-7-g463e20c
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 463e20c5c6a5c23aeedbe6cf5d163592e783a6d7 (commit) via d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30 (commit) via f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a (commit) via 684338aff6cecad6e9ef32e321dd318081edb721 (commit) via b947113b429b80bd6b3b14a62d2123718308e14a (commit) via 3d3713121b55320ce8031b838ba5ca5b844f2975 (commit) via 68c8201711b93b6db224318404b14e62e04b462d (commit) from 7700df9b1ef66761cad08cfc08344d5b27660e9f (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| 14 +++--- Modules/FindPython/Support.cmake | 22 +- Source/cmTargetLinkLibrariesCommand.cxx| 4 ++-- .../target_link_libraries/CMakeLists.txt | 4 .../target_link_libraries/SubDirC/CMakeLists.txt | 9 + .../target_link_libraries/SubDirC/SubDirC.c| 11 +++ Tests/CMakeCommands/target_link_libraries/TopDir.c | 6 ++ 7 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 Tests/CMakeCommands/target_link_libraries/SubDirC/CMakeLists.txt create mode 100644 Tests/CMakeCommands/target_link_libraries/SubDirC/SubDirC.c 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.3-808-g6dbc12d
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 6dbc12df684e146d15e9d5f9a68972f0a2196e10 (commit)
via a1709057ef6fa557d9106bac0da54899952d5cba (commit)
via 24e7554e15f12233b6e2fd294b9be4c1f8c24a06 (commit)
via f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a (commit)
via 684338aff6cecad6e9ef32e321dd318081edb721 (commit)
via c9469c78a5545b5a04ecf0f27b50500140aca5e9 (commit)
via 68c8201711b93b6db224318404b14e62e04b462d (commit)
from 87120b9c2a1aae4671b674ad3e06cd9666d91752 (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=6dbc12df684e146d15e9d5f9a68972f0a2196e10
commit 6dbc12df684e146d15e9d5f9a68972f0a2196e10
Merge: a170905 68c8201
Author: Brad King
AuthorDate: Wed May 1 16:00:35 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 12:02:07 2019 -0400
Merge topic 'FindPython-NumPy-fix-dependencies-management'
68c8201711 FindPython: NumPy: fix erroneous dependencies management
Acked-by: Kitware Robot
Merge-request: !3274
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1709057ef6fa557d9106bac0da54899952d5cba
commit a1709057ef6fa557d9106bac0da54899952d5cba
Merge: 24e7554 f06bf0f
Author: Brad King
AuthorDate: Wed May 1 16:00:26 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 12:00:54 2019 -0400
Merge topic 'FindBoost-fix-fiber-compiler-features'
f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context`
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above
Acked-by: Kitware Robot
Merge-request: !3266
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24e7554e15f12233b6e2fd294b9be4c1f8c24a06
commit 24e7554e15f12233b6e2fd294b9be4c1f8c24a06
Merge: 87120b9 c9469c7
Author: Brad King
AuthorDate: Wed May 1 11:59:52 2019 -0400
Commit: Brad King
CommitDate: Wed May 1 11:59:52 2019 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a
commit f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a
Author: Alex Turbov
AuthorDate: Fri Apr 26 14:46:17 2019 +0800
Commit: Brad King
CommitDate: Tue Apr 30 14:26:07 2019 -0400
FindBoost: Fix compiler features for `fiber` and `context`
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index cd79f24..552c2fd 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1072,6 +1072,8 @@ function(_Boost_COMPILER_FEATURES component _ret)
cxx_thread_local
cxx_variadic_templates
)
+# Compiler feature for `context` same as for `fiber`.
+set(_Boost_CONTEXT_COMPILER_FEATURES ${_Boost_FIBER_COMPILER_FEATURES})
endif()
string(TOUPPER ${component} uppercomponent)
set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=684338aff6cecad6e9ef32e321dd318081edb721
commit 684338aff6cecad6e9ef32e321dd318081edb721
Author: Alex Turbov
AuthorDate: Fri Apr 26 14:46:17 2019 +0800
Commit: Brad King
CommitDate: Tue Apr 30 14:25:51 2019 -0400
FindBoost: Record compiler features for Boost 1.67 and above
Remove the 1.67 upper-bound on compiler feature computation so that with
newer versions we at least get it mostly right. Leave a comment with
notes about updating features for future versions.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index b5cc4cf..cd79f24 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1048,11 +1048,17 @@ endfunction()
# Some boost libraries may require particular set of compler features.
# The very first one was `boost::fiber` introduced in Boost 1.62.
# One can check required compiler features of it in
-# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
+# - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
+# - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
+#
+# TODO (Re)Check compiler features on (every?) release ???
+# One may use the following command to get the files to check:
+#
+# $ find . -name Jamfile.v2 | grep build | xargs grep -l cxx1
#
function(_Boost_COMPILER_FEATURES component _ret)
- # Boost >= 1.62 and < 1.67
- if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS
106700)
+ # Boost >= 1.62
+ if(NOT Boost_VERSION VERSION_LESS 106200)
set(_Boost_FIBER_COMPILER_FEATURES
cxx_alias_templates
cxx_auto_type
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9469c78a5545b5a04ecf0f27b50500140aca5e9
commit c9469c78a5545b5a04ecf0f27b50500140aca5e9
Merge: 0c2469e 3d37131
[Cmake-commits] CMake branch, master, updated. v3.14.3-801-g87120b9
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 87120b9c2a1aae4671b674ad3e06cd9666d91752 (commit)
via 3d3713121b55320ce8031b838ba5ca5b844f2975 (commit)
from f4e2face6f867601f8a73754d627a81b26cdfd60 (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=87120b9c2a1aae4671b674ad3e06cd9666d91752
commit 87120b9c2a1aae4671b674ad3e06cd9666d91752
Merge: f4e2fac 3d37131
Author: Brad King
AuthorDate: Wed May 1 15:50:23 2019 +
Commit: Kitware Robot
CommitDate: Wed May 1 11:50:33 2019 -0400
Merge topic 'out-of-dir-linking-private-deps'
3d3713121b target_link_libraries: Fix static library private deps in other
dirs
Acked-by: Kitware Robot
Merge-request: !3276
diff --cc Source/cmTargetLinkLibrariesCommand.cxx
index 5c7b95c,ded6831..3883b52
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@@ -452,12 -449,11 +452,12 @@@ bool cmTargetLinkLibrariesCommand::Hand
// STATIC library.)
if (this->CurrentProcessingState == ProcessingKeywordPrivateInterface ||
this->CurrentProcessingState == ProcessingPlainPrivateInterface) {
-if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY) {
+if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY ||
+this->Target->GetType() == cmStateEnums::OBJECT_LIBRARY) {
std::string configLib =
this->Target->GetDebugGeneratorExpressions(libRef, llt);
- if (cmGeneratorExpression::IsValidTargetName(libRef) ||
- cmGeneratorExpression::Find(libRef) != std::string::npos) {
+ if (cmGeneratorExpression::IsValidTargetName(lib) ||
+ cmGeneratorExpression::Find(lib) != std::string::npos) {
configLib = "$";
}
this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d3713121b55320ce8031b838ba5ca5b844f2975
commit 3d3713121b55320ce8031b838ba5ca5b844f2975
Author: Brad King
AuthorDate: Tue Apr 30 13:18:47 2019 -0400
Commit: Brad King
CommitDate: Tue Apr 30 13:53:10 2019 -0400
target_link_libraries: Fix static library private deps in other dirs
In commit a1ad0a699b (target_link_libraries: Allow use with targets in
other directories, 2018-09-07, v3.13.0-rc1~94^2) we accidentally broke
the logic that adds `$` to private dependencies of static
libraries in their `INTERFACE_LINK_LIBRARIES` in the case that the
dependency is added from outside the directory creating the library.
The check for a valid target name should apply to the original name
specified by the caller and not the encoded cross-directory reference.
Fixes: #19197
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx
b/Source/cmTargetLinkLibrariesCommand.cxx
index ad33f98..ded6831 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -452,8 +452,8 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const
std::string& lib,
if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY) {
std::string configLib =
this->Target->GetDebugGeneratorExpressions(libRef, llt);
- if (cmGeneratorExpression::IsValidTargetName(libRef) ||
- cmGeneratorExpression::Find(libRef) != std::string::npos) {
+ if (cmGeneratorExpression::IsValidTargetName(lib) ||
+ cmGeneratorExpression::Find(lib) != std::string::npos) {
configLib = "$";
}
this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 85ce1f7..5c704ac 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -134,11 +134,15 @@ assert_property(newsignature1 LINK_LIBRARIES
"depC;depB;subdirlib")
#
# Test cross-directory linking.
cmake_policy(PUSH)
+cmake_policy(SET CMP0022 NEW)
cmake_policy(SET CMP0079 NEW)
add_executable(TopDir TopDir.c)
add_subdirectory(SubDirA)
add_subdirectory(SubDirB)
target_link_libraries(SubDirB TopDirImported)
+add_subdirectory(SubDirC)
+target_link_libraries(SubDirC PRIVATE SubDirC2)
+target_link_libraries(TopDir SubDirC)
add_library(TopDirImported IMPORTED INTERFACE)
target_compile_definitions(TopDirImported INTERFACE DEF_TopDirImported)
cmake_policy(POP)
diff --git a/Tests/CMakeCommands/target_link_libraries/SubDirC/CMakeLists.txt
[Cmake-commits] CMake branch, master, updated. v3.14.3-799-gf4e2fac
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 f4e2face6f867601f8a73754d627a81b26cdfd60 (commit) from e138207c42f39e8cc49a7f954a75b2a8da522e6a (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=f4e2face6f867601f8a73754d627a81b26cdfd60 commit f4e2face6f867601f8a73754d627a81b26cdfd60 Author: Kitware Robot AuthorDate: Wed May 1 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Wed May 1 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a7e8ee1..dd166e0 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 20190430) +set(CMake_VERSION_PATCH 20190501) #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.3-798-ge138207
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 e138207c42f39e8cc49a7f954a75b2a8da522e6a (commit)
via 599587feb1685eb75b7efe32cfcc16fed13d65b5 (commit)
via 6cc93b370ef59208b9b468ebc9d84cc02e3cbd85 (commit)
via 377d1b7896e07a171bcfe8da6d9dcda6545052c2 (commit)
from ea026fb2198ebd47353270461059183bbff867bd (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=e138207c42f39e8cc49a7f954a75b2a8da522e6a
commit e138207c42f39e8cc49a7f954a75b2a8da522e6a
Merge: ea026fb 599587f
Author: Craig Scott
AuthorDate: Tue Apr 30 22:34:49 2019 +
Commit: Kitware Robot
CommitDate: Tue Apr 30 18:35:06 2019 -0400
Merge topic 'message-new-types-and-logging'
599587feb1 message(): Minor code modernization
6cc93b370e message(): Add support for log levels
377d1b7896 cmSystemTools: Remove unused message-related code, simplify logic
Acked-by: Kitware Robot
Acked-by: Brad King
Merge-request: !3268
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=599587feb1685eb75b7efe32cfcc16fed13d65b5
commit 599587feb1685eb75b7efe32cfcc16fed13d65b5
Author: Alex Turbov
AuthorDate: Sat Apr 27 18:31:33 2019 +1000
Commit: Craig Scott
CommitDate: Sun Apr 28 22:45:44 2019 +1000
message(): Minor code modernization
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index 7242037..5320ec5 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -22,11 +22,11 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
this->SetError("called with incorrect number of arguments");
return false;
}
- std::vector::const_iterator i = args.begin();
+ auto i = args.cbegin();
- MessageType type = MessageType::MESSAGE;
- bool status = false;
- bool fatal = false;
+ auto type = MessageType::MESSAGE;
+ auto status = false;
+ auto fatal = false;
auto level = cmake::LogLevel::LOG_UNDEFINED;
if (*i == "SEND_ERROR") {
type = MessageType::FATAL_ERROR;
@@ -103,7 +103,7 @@ bool cmMessageCommand::InitialPass(std::vector
const& args,
return true;
}
- std::string message = cmJoin(cmMakeRange(i, args.end()), std::string());
+ auto message = cmJoin(cmMakeRange(i, args.cend()), "");
if (type != MessageType::MESSAGE) {
// we've overridden the message type, above, so display it directly
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cc93b370ef59208b9b468ebc9d84cc02e3cbd85
commit 6cc93b370ef59208b9b468ebc9d84cc02e3cbd85
Author: Alex Turbov
AuthorDate: Sat Apr 27 17:31:03 2019 +1000
Commit: Craig Scott
CommitDate: Sun Apr 28 22:45:44 2019 +1000
message(): Add support for log levels
Relates: #18943
Co-Authored-By: Craig Scott
diff --git a/Auxiliary/bash-completion/cmake b/Auxiliary/bash-completion/cmake
index 8c0c5e8..638b1c4 100644
--- a/Auxiliary/bash-completion/cmake
+++ b/Auxiliary/bash-completion/cmake
@@ -116,6 +116,9 @@ _cmake()
2>/dev/null )' -- "$quoted" ) )
return
;;
+--loglevel)
+COMPREPLY=( $(compgen -W 'error warning notice status verbose
debug trace' -- $cur ) )
+;;
--help-command)
COMPREPLY=( $( compgen -W '$( cmake --help-command-list
2>/dev/null|
grep -v "^cmake version " )' -- "$cur" ) )
diff --git a/Help/command/message.rst b/Help/command/message.rst
index a3c3a89..3f9216a 100644
--- a/Help/command/message.rst
+++ b/Help/command/message.rst
@@ -9,24 +9,56 @@ Display a message to the user.
The optional keyword determines the type of message:
-::
-
- (none) = Important information
- STATUS = Incidental information
- WARNING= CMake Warning, continue processing
- AUTHOR_WARNING = CMake Warning (dev), continue processing
- SEND_ERROR = CMake Error, continue processing,
-but skip generation
- FATAL_ERROR= CMake Error, stop processing and generation
- DEPRECATION= CMake Deprecation Error or Warning if variable
- CMAKE_ERROR_DEPRECATED or CMAKE_WARN_DEPRECATED
- is enabled, respectively, else no message.
-
-The CMake command-line tool displays STATUS messages on stdout and all
-other message types on stderr. The CMake GUI displays all messages in
-its log area. The interactive dialogs (ccmake and CMakeSetup) show
-``STATUS`` messages one at a time on a status line and other messages in
-interactive pop-up boxes.
+``FATAL_ERROR``
+ CMake Error, stop processing and generation.
+
+``SEND_ERROR``
+ CMake Error,
[Cmake-commits] CMake branch, master, updated. v3.14.3-794-gea026fb
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 ea026fb2198ebd47353270461059183bbff867bd (commit)
via c74698cb75b9923517f7f87eacf04ca0eefc8e72 (commit)
via 8cfd25db711c22f9478e565a496145577df24d77 (commit)
via c0e6b22d0a81c0e0dc1ee87366790882a3d54667 (commit)
from 40852eed8e304dffd7254d6790850e0a73766d9e (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=ea026fb2198ebd47353270461059183bbff867bd
commit ea026fb2198ebd47353270461059183bbff867bd
Merge: 40852ee c74698c
Author: Brad King
AuthorDate: Tue Apr 30 14:34:59 2019 +
Commit: Kitware Robot
CommitDate: Tue Apr 30 10:35:11 2019 -0400
Merge topic 'cmuvstreambuf'
c74698cb75 cmUVStreambuf: Add std::streambuf implementation for uv_stream_t
8cfd25db71 cmUVHandlePtr: Add cm::uv_loop_ptr
c0e6b22d0a Refactor: Move/rename cmProcessGetPipes() to cmGetPipes()
Acked-by: Kitware Robot
Merge-request: !3240
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c74698cb75b9923517f7f87eacf04ca0eefc8e72
commit c74698cb75b9923517f7f87eacf04ca0eefc8e72
Author: Kyle Edwards
AuthorDate: Tue Apr 16 17:58:02 2019 -0400
Commit: Kyle Edwards
CommitDate: Thu Apr 25 12:14:00 2019 -0400
cmUVStreambuf: Add std::streambuf implementation for uv_stream_t
This will allow std::istream/std::ostream-based interaction with
processes spawned by libuv.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 6fa046c..01c6cd7 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -388,6 +388,7 @@ set(SRCS
cmUuid.cxx
cmUVHandlePtr.cxx
cmUVHandlePtr.h
+ cmUVStreambuf.h
cmUVSignalHackRAII.h
cmVariableWatch.cxx
cmVariableWatch.h
diff --git a/Source/cmUVStreambuf.h b/Source/cmUVStreambuf.h
new file mode 100644
index 000..29e4fde
--- /dev/null
+++ b/Source/cmUVStreambuf.h
@@ -0,0 +1,219 @@
+/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+ file Copyright.txt or https://cmake.org/licensing for details. */
+#ifndef cmUVStreambuf_h
+#define cmUVStreambuf_h
+
+#include "cmUVHandlePtr.h"
+
+#include "cm_uv.h"
+
+#include
+#include
+#include
+#include
+
+/*
+ * This file is based on example code from:
+ *
+ * http://www.voidcn.com/article/p-vjnlygmc-gy.html
+ *
+ * The example code was distributed under the following license:
+ *
+ * Copyright 2007 Edd Dawson.
+ * Distributed under the Boost Software License, Version 1.0.
+ *
+ * Boost Software License - Version 1.0 - August 17th, 2003
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+template >
+class cmBasicUVStreambuf : public std::basic_streambuf
+{
+public:
+ cmBasicUVStreambuf(std::size_t bufSize = 256, std::size_t putBack = 8);
+ ~cmBasicUVStreambuf() override;
+
+ bool is_open() const;
+
+ cmBasicUVStreambuf* open(uv_stream_t* stream);
+
+ cmBasicUVStreambuf* close();
+
+protected:
+ typename cmBasicUVStreambuf::int_type underflow() override;
+ std::streamsize showmanyc() override;
+
+ // FIXME: Add write support
+
+private:
+ uv_stream_t* Stream = nullptr;
+ void* OldStreamData;
+ const std::size_t PutBack;
+ std::vector InputBuffer;
+ bool EndOfFile;
+
+ void StreamReadStartStop();
+
+ void StreamRead(ssize_t nread);
+ void HandleAlloc(uv_buf_t*
[Cmake-commits] CMake branch, master, updated. v3.14.3-790-g40852ee
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 40852eed8e304dffd7254d6790850e0a73766d9e (commit)
via 8d93815d204b4827ff9f1280a73e55861c00f47c (commit)
from d0e6fc28334023a42fbae797ece8c8e8526dc1c3 (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=40852eed8e304dffd7254d6790850e0a73766d9e
commit 40852eed8e304dffd7254d6790850e0a73766d9e
Merge: d0e6fc2 8d93815
Author: Kyle Edwards
AuthorDate: Tue Apr 30 14:30:26 2019 +
Commit: Kitware Robot
CommitDate: Tue Apr 30 10:30:35 2019 -0400
Merge topic 'source_group-tree-files'
8d93815d20 source_group command ensures that FILES arguments are actually
files
Acked-by: Kitware Robot
Merge-request: !3265
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d93815d204b4827ff9f1280a73e55861c00f47c
commit 8d93815d204b4827ff9f1280a73e55861c00f47c
Author: Mateusz Janek
AuthorDate: Thu Apr 25 20:51:40 2019 +0200
Commit: Mateusz Janek
CommitDate: Thu Apr 25 20:51:40 2019 +0200
source_group command ensures that FILES arguments are actually files
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 2bc4c39..5cdacaa 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -80,7 +80,10 @@ std::vector prepareFilesPathsForTree(
prepared.reserve(filesPaths.size());
for (auto const& filePath : filesPaths) {
-prepared.push_back(prepareFilePathForTree(filePath, currentSourceDir));
+// If provided file path is actually not a file, silently ignore it.
+if (cmSystemTools::FileExists(filePath, /*isFile=*/true)) {
+ prepared.push_back(prepareFilePathForTree(filePath, currentSourceDir));
+}
}
return prepared;
diff --git a/Tests/SourceGroups/CMakeLists.txt
b/Tests/SourceGroups/CMakeLists.txt
index 813774d..a5740bb 100644
--- a/Tests/SourceGroups/CMakeLists.txt
+++ b/Tests/SourceGroups/CMakeLists.txt
@@ -42,8 +42,16 @@ set(tree_files_with_prefix ${root}/tree_prefix_foo.c
set(tree_files_with_empty_prefix ${root}/tree_empty_prefix_foo.c
tree_empty_prefix_bar.c)
+set(tree_files_which_are_actually_directories ${root}
+ ${root}/
+ ${root}/sub1
+ ${root}/sub1/)
+
source_group(TREE ${root} FILES ${tree_files_without_prefix})
+# Should not crash and not add any files - just silently ignore the directories
+source_group(TREE ${root} FILES ${tree_files_which_are_actually_directories})
+
source_group(FILES ${tree_files_with_prefix} PREFIX tree_root/subgroup TREE
${root})
source_group(PREFIX "" FILES ${tree_files_with_empty_prefix} TREE ${root})
---
Summary of changes:
Source/cmSourceGroupCommand.cxx | 5 -
Tests/SourceGroups/CMakeLists.txt | 8
2 files changed, 12 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.14.3-788-gd0e6fc2
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 d0e6fc28334023a42fbae797ece8c8e8526dc1c3 (commit) via 60515b205e0151fa0194a984850e652a04a9a165 (commit) via d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1 (commit) via 60b28de5c8c364d26824dbe2c2666ea47e8870a2 (commit) via b74061ba386a46d273bea37f377998a4e1936a65 (commit) via 996e1885c4995e2d73712a7d0aaa0d615be5fdf0 (commit) via 61f70e81a708db126ba5e2d1135ff0e2a5ffba25 (commit) via 7db32efbab1c61e4b8032702eba5ac6d7768d531 (commit) via ce078dda79df1c8d9f142e45d2fa3cf971a09594 (commit) via 044dcf9f8d2bfb10825627f7e18456a1679d5ab6 (commit) via d350fb688954f476d8df79bf582cf366b5861dd2 (commit) from 71371e3d936c89945e4369c0daebe9c7e13dec31 (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=d0e6fc28334023a42fbae797ece8c8e8526dc1c3 commit d0e6fc28334023a42fbae797ece8c8e8526dc1c3 Merge: 60515b2 ce078dd Author: Brad King AuthorDate: Tue Apr 30 14:09:39 2019 + Commit: Kitware Robot CommitDate: Tue Apr 30 10:09:52 2019 -0400 Merge topic 'relax_TARGET_OBJECT_generator_expr' ce078dda79 Relax the usage of TARGET_OBJECTS generator expression Acked-by: Kitware Robot Merge-request: !3178 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60515b205e0151fa0194a984850e652a04a9a165 commit 60515b205e0151fa0194a984850e652a04a9a165 Merge: d9a4da4 7db32ef Author: Brad King AuthorDate: Tue Apr 30 14:07:38 2019 + Commit: Kitware Robot CommitDate: Tue Apr 30 10:08:22 2019 -0400 Merge topic 'findmpi-msvc-nolibdir' 7db32efbab FindMPI: Don't retain libdirs for Win32 Acked-by: Kitware Robot Merge-request: !3253 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1 commit d9a4da453fb6fe2a5f16eb35a0d3756f88801ba1 Merge: 60b28de 996e188 Author: Brad King AuthorDate: Tue Apr 30 14:07:20 2019 + Commit: Kitware Robot CommitDate: Tue Apr 30 10:07:27 2019 -0400 Merge topic 'server-deprecate' 996e1885c4 server: deprecate in favor of the file-api Acked-by: Kitware Robot Acked-by: Kyle Edwards Merge-request: !3251 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60b28de5c8c364d26824dbe2c2666ea47e8870a2 commit 60b28de5c8c364d26824dbe2c2666ea47e8870a2 Merge: b74061b 044dcf9 Author: Brad King AuthorDate: Tue Apr 30 14:04:42 2019 + Commit: Kitware Robot CommitDate: Tue Apr 30 10:05:09 2019 -0400 Merge topic 'add-execute_process-command-echo' 044dcf9f8d execute_process: Add option to echo command lines d350fb6889 execute_process: Manage KWSys Process lifetime with unique_ptr Acked-by: Kitware Robot Merge-request: !3165 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b74061ba386a46d273bea37f377998a4e1936a65 commit b74061ba386a46d273bea37f377998a4e1936a65 Merge: 71371e3 61f70e8 Author: Brad King AuthorDate: Tue Apr 30 14:03:12 2019 + Commit: Kitware Robot CommitDate: Tue Apr 30 10:03:20 2019 -0400 Merge topic 'msvc-runtime-library' 61f70e81a7 MSVC: Document and test behavior of empty MSVC_RUNTIME_LIBRARY Acked-by: Kitware Robot Merge-request: !3249 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=996e1885c4995e2d73712a7d0aaa0d615be5fdf0 commit 996e1885c4995e2d73712a7d0aaa0d615be5fdf0 Author: Brad King AuthorDate: Fri Apr 19 13:43:57 2019 -0400 Commit: Brad King CommitDate: Mon Apr 22 09:38:44 2019 -0400 server: deprecate in favor of the file-api Document the server mode as deprecated. Add a deprecation message to the configure step output when invoked through server mode. Closes: #19101 diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst index 25d364c..8f10b9f 100644 --- a/Help/manual/cmake-server.7.rst +++ b/Help/manual/cmake-server.7.rst @@ -7,6 +7,11 @@ cmake-server(7) .. contents:: +.. deprecated:: 3.15 + + This will be removed from a future version of CMake. + Clients should use the :manual:`cmake-file-api(7)` instead. + Introduction diff --git a/Help/release/dev/server-deprecate.rst b/Help/release/dev/server-deprecate.rst new file mode 100644 index 000..65c86e1 --- /dev/null +++ b/Help/release/dev/server-deprecate.rst @@ -0,0 +1,6 @@ +server-deprecate + + +* The :manual:`cmake-server(7)` mode has been deprecated and will be + removed from a future version of CMake. Please port clients to use + the :manual:`cmake-file-api(7)` instead. diff
