From kwrobot at kitware.com Fri Mar 1 00:03:05 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 00:03:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-300-g2f59cd6 Message-ID: <20190301050305.4865D11362D@public.kitware.com> 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 2f59cd637181cd246ab700767ea3e3cbd6cc3df4 (commit) from d84fb10034fc7371474c3d1413e78c317f743833 (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=2f59cd637181cd246ab700767ea3e3cbd6cc3df4 commit 2f59cd637181cd246ab700767ea3e3cbd6cc3df4 Author: Kitware Robot AuthorDate: Fri Mar 1 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Fri Mar 1 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a6ae1fe..d9b54f1 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 20190228) +set(CMake_VERSION_PATCH 20190301) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 08:53:06 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 08:53:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-304-g0465c32 Message-ID: <20190301135306.C734F150A@public.kitware.com> 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 0465c32a82f4da7745294edb1b0efe50ca66e15c (commit) via 9a5fe96f4fb8b5fbc39f8a01a388cf428ffaed32 (commit) via e21bae378d54b24f695080d05d55a9cfc6858877 (commit) via f20eab9cdc26ffbacb32e5942e2969058e50581a (commit) from 2f59cd637181cd246ab700767ea3e3cbd6cc3df4 (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=0465c32a82f4da7745294edb1b0efe50ca66e15c commit 0465c32a82f4da7745294edb1b0efe50ca66e15c Merge: 9a5fe96 f20eab9 Author: Brad King AuthorDate: Fri Mar 1 13:52:08 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 08:52:37 2019 -0500 Merge topic 'processor_count_linux_containers' f20eab9cdc ProcessorCount: Return the container CPU count instead of the host count Acked-by: Kitware Robot Merge-request: !3032 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a5fe96f4fb8b5fbc39f8a01a388cf428ffaed32 commit 9a5fe96f4fb8b5fbc39f8a01a388cf428ffaed32 Merge: 2f59cd6 e21bae3 Author: Brad King AuthorDate: Fri Mar 1 13:51:31 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 08:51:50 2019 -0500 Merge topic 'drop-MIPSpro' e21bae378d WCDH: Restore definition for _COMPILER_IS_MIPSpro Acked-by: Kitware Robot Merge-request: !3043 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e21bae378d54b24f695080d05d55a9cfc6858877 commit e21bae378d54b24f695080d05d55a9cfc6858877 Author: Brad King AuthorDate: Thu Feb 28 11:32:16 2019 -0500 Commit: Brad King CommitDate: Thu Feb 28 11:34:36 2019 -0500 WCDH: Restore definition for _COMPILER_IS_MIPSpro Code removed for MIPSpro by commit 214fcefa52 (Remove now-unused code once used for MIPSpro on IRIX, 2019-02-21) actually changed a public-facing API by dropping the `_COMPILER_IS_MIPSpro` definition from the generated compiler detection header. Restore the definition hard-coded to `0` since the compiler will never be MIPSpro. Reported-by: Hans Johnson diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake index 7039b8d..01284eb 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -96,6 +96,8 @@ function(compiler_id_detection outvar lang) foreach(Id ${ordered_compilers}) string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "# define ${CID_PREFIX}COMPILER_IS_${Id} 0\n") endforeach() + # Hard-code definitions for compilers that are no longer supported. + string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "# define ${CID_PREFIX}COMPILER_IS_MIPSpro 0\n") endif() set(pp_if "#if") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f20eab9cdc26ffbacb32e5942e2969058e50581a commit f20eab9cdc26ffbacb32e5942e2969058e50581a Author: Sylvain Joubert AuthorDate: Wed Feb 27 12:47:07 2019 +0100 Commit: Sylvain Joubert CommitDate: Wed Feb 27 13:04:07 2019 +0100 ProcessorCount: Return the container CPU count instead of the host count On Linux containers (tested with LXC and Docker) getconf returns the host CPU count. Use nproc with a higher priority if available to get the container's allocated CPUs instead of the non-accessible host count. diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake index e4b4e53..8c25256 100644 --- a/Modules/ProcessorCount.cmake +++ b/Modules/ProcessorCount.cmake @@ -70,6 +70,20 @@ function(ProcessorCount var) endif() if(NOT count) + # Linux (systems with nproc): + # Prefer nproc to getconf if available as getconf may return the host CPU count in Linux containers + find_program(ProcessorCount_cmd_nproc nproc) + mark_as_advanced(ProcessorCount_cmd_nproc) + if(ProcessorCount_cmd_nproc) + execute_process(COMMAND ${ProcessorCount_cmd_nproc} + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + OUTPUT_VARIABLE count) + #message("ProcessorCount: trying nproc '${ProcessorCount_cmd_nproc}'") + endif() + endif() + + if(NOT count) # Linux (systems with getconf): find_program(ProcessorCount_cmd_getconf getconf) mark_as_advanced(ProcessorCount_cmd_getconf) ----------------------------------------------------------------------- Summary of changes: Modules/CMakeCompilerIdDetection.cmake | 2 ++ Modules/ProcessorCount.cmake | 14 ++++++++++++++ 2 files changed, 16 insertions(+) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 09:03:03 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 09:03:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-307-g911d67b Message-ID: <20190301140303.5FC35A2B52@public.kitware.com> 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 911d67b173ef2ece7f7e5f5ee73f69515bffe262 (commit) via b8307adb9f1cd5c5d8fc5a75fb958356b2f091d7 (commit) via 19e15853e9ace8df5acfd784811479cc14d3a369 (commit) from 0465c32a82f4da7745294edb1b0efe50ca66e15c (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=911d67b173ef2ece7f7e5f5ee73f69515bffe262 commit 911d67b173ef2ece7f7e5f5ee73f69515bffe262 Merge: 0465c32 b8307ad Author: Brad King AuthorDate: Fri Mar 1 13:52:25 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 08:53:31 2019 -0500 Merge topic 'doc-install-internal-xref' b8307adb9f Help: inter-link install() commands 19e15853e9 Help: add inter link anchors for install() commands Acked-by: Kitware Robot Merge-request: !3034 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8307adb9f1cd5c5d8fc5a75fb958356b2f091d7 commit b8307adb9f1cd5c5d8fc5a75fb958356b2f091d7 Author: NeroBurner AuthorDate: Wed Feb 27 11:23:39 2019 -0500 Commit: Brad King CommitDate: Thu Feb 28 11:49:53 2019 -0500 Help: inter-link install() commands diff --git a/Help/command/install.rst b/Help/command/install.rst index 5580a20..4cef787 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -266,20 +266,20 @@ the following additional arguments: is not recommended to use ``NAMELINK_SKIP`` in conjunction with ``NAMELINK_COMPONENT``. -The ``install(TARGETS)`` command can also accept the following options at the +The `install(TARGETS)`_ command can also accept the following options at the top level: ``EXPORT`` This option associates the installed target files with an export called ````. It must appear before any target options. To actually - install the export file itself, call ``install(EXPORT)``, documented below. + install the export file itself, call `install(EXPORT)`_, documented below. See documentation of the :prop_tgt:`EXPORT_NAME` target property to change the name of the exported target. ``INCLUDES DESTINATION`` This option specifies a list of directories which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` target property of the - ```` when exported by the :command:`install(EXPORT)` command. If a + ```` when exported by the `install(EXPORT)`_ command. If a relative path is specified, it is treated as relative to the ``$``. @@ -313,7 +313,7 @@ targets that link to the object libraries in their implementation. Installing a target with the :prop_tgt:`EXCLUDE_FROM_ALL` target property set to ``TRUE`` has undefined behavior. -:command:`install(TARGETS)` can install targets that were created in +`install(TARGETS)`_ can install targets that were created in other directories. When using such cross-directory install rules, running ``make install`` (or similar) from a subdirectory will not guarantee that targets from other directories are up-to-date. You can use @@ -580,7 +580,7 @@ Installing Exports The ``EXPORT`` form generates and installs a CMake file containing code to import targets from the installation tree into another project. Target installations are associated with the export ```` -using the ``EXPORT`` option of the ``install(TARGETS)`` signature +using the ``EXPORT`` option of the `install(TARGETS)`_ signature documented above. The ``NAMESPACE`` option will prepend ```` to the target names as they are written to the import file. By default the generated file will be called ``.cmake`` but the ``FILE`` https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19e15853e9ace8df5acfd784811479cc14d3a369 commit 19e15853e9ace8df5acfd784811479cc14d3a369 Author: NeroBurner-tux AuthorDate: Wed Feb 27 21:37:51 2019 +0100 Commit: Brad King CommitDate: Thu Feb 28 11:49:23 2019 -0500 Help: add inter link anchors for install() commands diff --git a/Help/command/install.rst b/Help/command/install.rst index 8c98b65..5580a20 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -99,6 +99,7 @@ Windows platforms are unaffected. Installing Targets ^^^^^^^^^^^^^^^^^^ +.. _`install(TARGETS)`: .. _TARGETS: .. code-block:: cmake @@ -327,6 +328,8 @@ use "generator expressions" with the syntax ``$<...>``. See the Installing Files ^^^^^^^^^^^^^^^^ +.. _`install(FILES)`: +.. _`install(PROGRAMS)`: .. _FILES: .. _PROGRAMS: @@ -404,6 +407,7 @@ use "generator expressions" with the syntax ``$<...>``. See the Installing Directories ^^^^^^^^^^^^^^^^^^^^^^ +.. _`install(DIRECTORY)`: .. _DIRECTORY: .. code-block:: cmake @@ -528,6 +532,8 @@ manual for available expressions. Custom Installation Logic ^^^^^^^^^^^^^^^^^^^^^^^^^ +.. _`install(CODE)`: +.. _`install(SCRIPT)`: .. _CODE: .. _SCRIPT: @@ -557,6 +563,7 @@ name, not the file's contents). See the Installing Exports ^^^^^^^^^^^^^^^^^^ +.. _`install(EXPORT)`: .. _EXPORT: .. code-block:: cmake ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 09:13:07 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 09:13:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-321-g57fd4b9 Message-ID: <20190301141307.6488A14BF9@public.kitware.com> 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 57fd4b9d65e86010b2aba0ab00d62eb90a5ddc50 (commit) via 980d9a987d10529e9e69d6d1991e0861fe03865d (commit) via 4cda0b66fa67bdf1ef0e3c859e49039366b981ff (commit) via 8b1716a62a4209d274cfb2334aa2330f21d6dbcb (commit) via 96a99d40698110dd81bf6222a6b9ad83daacc0e8 (commit) via 8d9cf290742d419a89488a055726c99ba1d754f8 (commit) via 77cede097742942e0acb08a52c09921d3708f430 (commit) via 9a54159f537763c9450b1ca32371449defa26a98 (commit) via 338e32b3b83e39a9fbc529eb0fca3ab0545819d4 (commit) via a6d3fee77cb526457ab3c5d427f93530f7621b2b (commit) via d5d1b1565499b293589dd94e8511d8f22e862d47 (commit) via 71852e969b711edeacff0b7143eda8c00a412bf1 (commit) via c9a7f3135e06147d663e98d910b65a38595f378b (commit) via 00c11208373cee958966d294e02114dc3900ac34 (commit) from 911d67b173ef2ece7f7e5f5ee73f69515bffe262 (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=57fd4b9d65e86010b2aba0ab00d62eb90a5ddc50 commit 57fd4b9d65e86010b2aba0ab00d62eb90a5ddc50 Merge: 980d9a9 8d9cf29 Author: Brad King AuthorDate: Fri Mar 1 09:10:51 2019 -0500 Commit: Brad King CommitDate: Fri Mar 1 09:10:51 2019 -0500 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=980d9a987d10529e9e69d6d1991e0861fe03865d commit 980d9a987d10529e9e69d6d1991e0861fe03865d Merge: 4cda0b6 d5d1b15 Author: Brad King AuthorDate: Fri Mar 1 14:07:27 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 09:08:56 2019 -0500 Merge topic 'cuda_device_link_handle_frameworks' d5d1b15654 CUDA: Filter out -framework arguments during device linking Acked-by: Kitware Robot Merge-request: !3039 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cda0b66fa67bdf1ef0e3c859e49039366b981ff commit 4cda0b66fa67bdf1ef0e3c859e49039366b981ff Merge: 8b1716a a6d3fee Author: Brad King AuthorDate: Fri Mar 1 14:07:42 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 09:08:15 2019 -0500 Merge topic 'ExternalProject-fix-log-in-custom-stamp' a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir Acked-by: Kitware Robot Merge-request: !3045 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b1716a62a4209d274cfb2334aa2330f21d6dbcb commit 8b1716a62a4209d274cfb2334aa2330f21d6dbcb Merge: 96a99d4 c9a7f31 Author: Brad King AuthorDate: Fri Mar 1 14:07:13 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 09:07:29 2019 -0500 Merge topic 'vs2019' c9a7f3135e Help: Update VS 2019 generator release note for preview 4 00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3 Acked-by: Kitware Robot Acked-by: Egor Pugin Merge-request: !3044 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a99d40698110dd81bf6222a6b9ad83daacc0e8 commit 96a99d40698110dd81bf6222a6b9ad83daacc0e8 Merge: 911d67b 77cede0 Author: Brad King AuthorDate: Fri Mar 1 14:06:46 2019 +0000 Commit: Kitware Robot CommitDate: Fri Mar 1 09:06:52 2019 -0500 Merge topic 'findjni-paths' 77cede0977 FindJNI: Unify path search, fix support for Java 9 Acked-by: Kitware Robot Merge-request: !3042 ----------------------------------------------------------------------- Summary of changes: Help/release/3.14.rst | 2 +- Modules/ExternalProject.cmake | 16 +++++- Modules/FindJNI.cmake | 99 ++++++++++++++++++------------------- Source/cmLinkLineDeviceComputer.cxx | 12 +++++ Source/cmVSSetupHelper.cxx | 8 --- 5 files changed, 74 insertions(+), 63 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 09:13:07 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 09:13:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.14.0-rc2-66-g8d9cf29 Message-ID: <20190301141307.B7778C0205@public.kitware.com> 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 8d9cf290742d419a89488a055726c99ba1d754f8 (commit) via 77cede097742942e0acb08a52c09921d3708f430 (commit) via 9a54159f537763c9450b1ca32371449defa26a98 (commit) via 338e32b3b83e39a9fbc529eb0fca3ab0545819d4 (commit) via a6d3fee77cb526457ab3c5d427f93530f7621b2b (commit) via d5d1b1565499b293589dd94e8511d8f22e862d47 (commit) via 71852e969b711edeacff0b7143eda8c00a412bf1 (commit) via c9a7f3135e06147d663e98d910b65a38595f378b (commit) via 00c11208373cee958966d294e02114dc3900ac34 (commit) from 18731d60ac4f14c080ef593c1b1f0a5beb330b02 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Help/release/3.14.rst | 2 +- Modules/ExternalProject.cmake | 16 +++++- Modules/FindJNI.cmake | 99 ++++++++++++++++++------------------- Source/cmLinkLineDeviceComputer.cxx | 12 +++++ Source/cmVSSetupHelper.cxx | 8 --- 5 files changed, 74 insertions(+), 63 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 11:13:03 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 11:13:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-323-g6bc6f41 Message-ID: <20190301161303.3A42414BF9@public.kitware.com> 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 6bc6f41068b06768f616d1602bd2e9edfab70b88 (commit) via 20a41aa589d4418f9ac46fc8c0402162d1d82873 (commit) from 57fd4b9d65e86010b2aba0ab00d62eb90a5ddc50 (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=6bc6f41068b06768f616d1602bd2e9edfab70b88 commit 6bc6f41068b06768f616d1602bd2e9edfab70b88 Merge: 57fd4b9 20a41aa Author: Brad King AuthorDate: Fri Mar 1 11:12:28 2019 -0500 Commit: Brad King CommitDate: Fri Mar 1 11:12:28 2019 -0500 Merge branch 'release-3.14' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From kwrobot at kitware.com Fri Mar 1 11:13:03 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 11:13:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.14.0-rc2-67-g20a41aa Message-ID: <20190301161303.4DCB814BF9@public.kitware.com> 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 20a41aa589d4418f9ac46fc8c0402162d1d82873 (commit) from 8d9cf290742d419a89488a055726c99ba1d754f8 (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 From kwrobot at kitware.com Fri Mar 1 11:23:06 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 1 Mar 2019 11:23:06 -0500 (EST) Subject: [Cmake-commits] CMake annotated tag, v3.14.0-rc3, created. v3.14.0-rc3 Message-ID: <20190301162306.19ECD14BF9@public.kitware.com> 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.0-rc3 has been created at afc1c744387081ca93d09b7f882c1efba24968a3 (tag) tagging 20a41aa589d4418f9ac46fc8c0402162d1d82873 (commit) replaces v3.14.0-rc2 tagged by Brad King on Fri Mar 1 11:09:45 2019 -0500 - Log ----------------------------------------------------------------- CMake 3.14.0-rc3 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlx5WUkWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhF+LD/9jTTc48riA2+3c5/bOXi2+uIP3 f1oysPcnFVSAkEujm6kx7s0ohZVqxvt9QqbCAL3znZ4jI1ZOdRrYuY6dWkibPMPT 4+jyKqXZWVZTMKd8wtfZYZ1fctWcwogZp3hZHLpfAA0k48CZIA/syiQnajl63HPP 4Mtba0nM7M9+9qPO3hYuQgsUcYBMilaNvE/k/rwy6+k5dj6JORvcWh9yoUZg/AMP Upnv6K0DMFfnASSPyJ2cNBV5ywsJcIxF9vpr1LTe3BYe5yvGZm+nRkUig9n/gF91 U1Up/MNE7qWS1z8QjBMyzEmwEdZdTPNTb0m6CRKJPuvWMlEhpXt4VVbkdHnT4CrY ZphwQTc7oFtbAlFsrrmHSo6bslkolLogepho9TezxMe1bf1Sfv3NXEjKCaCXWK8W +u8YFGJ4GqKmqE4rg5rm/65xoWr12cOSYRadVksUsooXhMUA6h9HQ2COdrWvrT1V AwH03RdPjfIa9u0yUeHuxb8EX53ySrUZWoSmWBmW7GWodwtxIAV97C6rpetOKxSD I9ZgRYJh+uQ7pCtvCyDZPs218VjEWJ2kLkgA6lTRWwRswo/cIapyzjNxV1uoDeZs /1x09lYeVaJoqOLh+76gD8J8WDQnybDC+Mrj2BQk22WibLPekwTxrCYgio4hcPa5 nkA/YG+2rReZqgJPmA== =TA0Y -----END PGP SIGNATURE----- Brad King (45): Merge branch 'get_filename_component_docs' into release-3.14 Merge branch 'externalproject_docs' into release-3.14 Merge branch 'file_symlink_docs' into release-3.14 Prefix implicit include directories with sysroot on construction Restore unconditional use of "standard" include directories Do not explicitly report "standard" include directories as implicit Use -? instead of /? to test compiler for MSVC-like command-line support Merge branch 'FindBoost-layout-tagged' into release-3.14 Merge branch 'fix-legacy-implicit-includes' into release-3.14 Merge branch 'asm-no-slash-question' into release-3.14 VS: Factor out a method to set the Windows SDK version internally VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when needed Merge branch 'vs-win-sdk' into release-3.14 Merge branch 'autogen_cache_binary_checks' into release-3.14 Fortran: Do not suppress explicit use of implicit include directories Merge branch 'fix-implicit-includes-fortran' into release-3.14 Merge branch 'link-options' into release-3.14 Merge branch 'remove-exclude-from-all-warning' into release-3.14 Merge branch 'check_lang_source_runs_output' into release-3.14 Merge branch 'docs_try_commands' into release-3.14 Merge branch 'releasenotes_arch_independent' into release-3.14 Merge branch 'qcc-asm-detection' into release-3.14 Tests: Restore support for CMake 3.1 through 3.6 with MSVC Merge branch 'doc-ctest-build-and-test-summary' into release-3.14 FindThreads: Fix libc check to use proper header for pthread_kill VS: Fix detection of clang-cl with -T llvm include_external_msproject: Restore support for EXCLUDE_FROM_ALL FindOctave: Remove module pending further work FindThreads: Revert libc symbol check to pthread_create Merge branch 'restore-min-cmake-3.1' into release-3.14 Merge branch 'vs-llvm-extension' into release-3.14 Merge branch 'include_external_msproject-exclude-from-all' into release-3.14 Merge branch 'FindOctave-remove' into release-3.14 Merge branch 'docs-rpath-origin-apple' into release-3.14 Merge branch 'cmake_role-vs-fix' into release-3.14 Merge branch 'FindThreads-revert-libc-check' into release-3.14 Merge branch 'backport-check-std-size-cbegin-cend' into release-3.14 VS: Drop workaround needed only for VS 2019 preview 2 and 3 Help: Update VS 2019 generator release note for preview 4 Merge branch 'vs2019' into release-3.14 ExternalProject: Restore default log dir with custom stamp dir Merge branch 'cuda_device_link_handle_frameworks' into release-3.14 Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14 Merge branch 'findjni-paths' into release-3.14 CMake 3.14.0-rc3 Christian Pfeiffer (1): FindJNI: Unify path search, fix support for Java 9 Craig Scott (12): Help: Remove outdated statement about get_filename_component() Help: Clarify and improve readability of link-related file subcommands Release notes: Make ExternalProject dot points consistent Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior EXCLUDE_FROM_ALL: Don't warn if installing target excluded from all CheckLangSourceRuns: Capture run output to log files Help: User-provided variable names for try_* commands Help: try_compile() readability and grammar improvements Help: Consistency in try_compile() docs for target type Help: Caveat for try_compile() and CMAKE_TRY_COMPILE_PLATFORM_VARIABLES Help: Add release note for new ARCH_INDEPENDENT option Help: Fix minor inaccuracies of what BUILD_RPATH_USE_ORIGIN affects Kyle Edwards (1): CMAKE_ROLE: Fix value in --build for Visual Studio generators Maikel van den Hurk (1): Add ASM Compiler detection for QCC Marc Chevrier (1): PIE link options: No warning when policy CMP0083 is not set. Mathieu Garaud (1): Extend C++17/C++14 feature checks to cover more standard library APIs Paul Seyfert (1): Help: Fix --build-and-test synopsis in ctest(1) Robert Maynard (1): CUDA: Filter out -framework arguments during device linking Sebastian Holtermann (2): Autogen: Add output caching GetExecutableTestOutput Autogen: Use output caching GetExecutableTestOutput Yves Frederix (1): FindBoost: Find boost libraries built with --layout=tagged ----------------------------------------------------------------------- hooks/post-receive -- CMake From kwrobot at kitware.com Sat Mar 2 00:03:08 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 2 Mar 2019 00:03:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-257-g26068d2 Message-ID: <20190302050308.1271F125262@public.kitware.com> 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 26068d2db88e685680fa400b1e4c26d710eeaadd (commit) from 6bc6f41068b06768f616d1602bd2e9edfab70b88 (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=26068d2db88e685680fa400b1e4c26d710eeaadd commit 26068d2db88e685680fa400b1e4c26d710eeaadd Author: Kitware Robot AuthorDate: Sat Mar 2 00:01:09 2019 -0500 Commit: Kitware Robot CommitDate: Sat Mar 2 00:01:09 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d9b54f1..a802aa7 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 20190301) +set(CMake_VERSION_PATCH 20190302) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Sun Mar 3 00:03:04 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 3 Mar 2019 00:03:04 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-258-g033728e Message-ID: <20190303050304.4879B11E50F@public.kitware.com> 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 033728e86780d61215ebcab442d9a130bdd0461c (commit) from 26068d2db88e685680fa400b1e4c26d710eeaadd (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=033728e86780d61215ebcab442d9a130bdd0461c commit 033728e86780d61215ebcab442d9a130bdd0461c Author: Kitware Robot AuthorDate: Sun Mar 3 00:01:05 2019 -0500 Commit: Kitware Robot CommitDate: Sun Mar 3 00:01:05 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a802aa7..c59a119 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 20190302) +set(CMake_VERSION_PATCH 20190303) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Mar 4 00:03:13 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 4 Mar 2019 00:03:13 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-259-gd1558fb Message-ID: <20190304050313.C9B6D11E6FD@public.kitware.com> 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 d1558fbf3ab770b8691a8548a297d1c48fe666eb (commit) from 033728e86780d61215ebcab442d9a130bdd0461c (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=d1558fbf3ab770b8691a8548a297d1c48fe666eb commit d1558fbf3ab770b8691a8548a297d1c48fe666eb Author: Kitware Robot AuthorDate: Mon Mar 4 00:01:14 2019 -0500 Commit: Kitware Robot CommitDate: Mon Mar 4 00:01:14 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c59a119..4aa4425 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 20190303) +set(CMake_VERSION_PATCH 20190304) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Mar 4 08:43:06 2019 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 4 Mar 2019 08:43:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-270-g6873e98 Message-ID: <20190304134306.9A87CFCBF9@public.kitware.com> 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 6873e984869d7f0f96cc8d93ebe76413d1b14b36 (commit) via 80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe (commit) via 70d204410af9745181ca3f9bc5c80e059f606fa8 (commit) via dbd3b1ac90b70f31f10488a97ec72c6a435106ec (commit) via 5c0ef417b8a85546e50f7107b0038cbb7d108d20 (commit) via 8e3358336dba2af42279c16a277116fc8fdfb826 (commit) via 77439d97fe66804f4cb69792bec5cbb6f5bb6e93 (commit) via 0b82f56ac69f2140cc05e7bdd4564ebf87ea6c6f (commit) via e53a968ed582e28522b65c0f4ca00741294425b8 (commit) via 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 (commit) via fa339ced67d14bb608b2a71c37c3b99d90941d47 (commit) from d1558fbf3ab770b8691a8548a297d1c48fe666eb (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=6873e984869d7f0f96cc8d93ebe76413d1b14b36 commit 6873e984869d7f0f96cc8d93ebe76413d1b14b36 Merge: 80898a4 e53a968 Author: Brad King AuthorDate: Mon Mar 4 13:42:40 2019 +0000 Commit: Kitware Robot CommitDate: Mon Mar 4 08:42:49 2019 -0500 Merge topic 'llvm-rc' e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS 1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc Acked-by: Kitware Robot Merge-request: !3007 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe commit 80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe Merge: 70d2044 5c0ef41 Author: Brad King AuthorDate: Mon Mar 4 08:37:36 2019 -0500 Commit: Brad King CommitDate: Mon Mar 4 08:37:36 2019 -0500 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70d204410af9745181ca3f9bc5c80e059f606fa8 commit 70d204410af9745181ca3f9bc5c80e059f606fa8 Merge: dbd3b1a 8e33583 Author: Brad King AuthorDate: Mon Mar 4 13:35:53 2019 +0000 Commit: Kitware Robot CommitDate: Mon Mar 4 08:36:29 2019 -0500 Merge topic 'FindPython-NumPy-fix-include-dir' 8e3358336d FindPython: Fix NumPy component include directory Acked-by: Kitware Robot Merge-request: !3053 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbd3b1ac90b70f31f10488a97ec72c6a435106ec commit dbd3b1ac90b70f31f10488a97ec72c6a435106ec Merge: d1558fb 0b82f56 Author: Brad King AuthorDate: Mon Mar 4 13:35:38 2019 +0000 Commit: Kitware Robot CommitDate: Mon Mar 4 08:35:46 2019 -0500 Merge topic 'vs-fortran-rc' 0b82f56ac6 VS: Fix Fortran target type selection with RC sources Acked-by: Kitware Robot Merge-request: !3050 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e53a968ed582e28522b65c0f4ca00741294425b8 commit e53a968ed582e28522b65c0f4ca00741294425b8 Author: Zsolt Parragi AuthorDate: Fri Mar 1 14:11:01 2019 +0100 Commit: Zsolt Parragi CommitDate: Fri Mar 1 14:11:01 2019 +0100 MSVC: Use -D instead of /D in RC_FLAGS llvm-rc can't handle definitions given with /D and without a space. diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 2daf313..0e11790 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -374,10 +374,12 @@ macro(__windows_compiler_msvc_enable_rc flags) set(CMAKE_RC_COMPILER_INIT rc) endif() if(NOT CMAKE_RC_FLAGS_INIT) - string(APPEND CMAKE_RC_FLAGS_INIT " ${flags}") + # llvm-rc fails when flags are specified with /D and no space after + string(REPLACE " /D" " -D" fixed_flags " ${flags}") + string(APPEND CMAKE_RC_FLAGS_INIT " ${fixed_flags}") endif() if(NOT CMAKE_RC_FLAGS_DEBUG_INIT) - string(APPEND CMAKE_RC_FLAGS_DEBUG_INIT " /D_DEBUG") + string(APPEND CMAKE_RC_FLAGS_DEBUG_INIT " -D_DEBUG") endif() enable_language(RC) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 commit 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 Author: Zsolt Parragi AuthorDate: Thu Feb 21 20:00:38 2019 +0100 Commit: Brad King CommitDate: Wed Feb 27 08:39:02 2019 -0500 RC: Pass output file in a way that llvm-rc 7 and below understand Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space after it. Add the space unconditionally because MS `rc` accepts it too. Issue: #18957 diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake index 1227fdf..7bf6567 100644 --- a/Modules/CMakeRCInformation.cmake +++ b/Modules/CMakeRCInformation.cmake @@ -32,7 +32,7 @@ set(CMAKE_INCLUDE_FLAG_RC "-I") # compile a Resource file into an object file if(NOT CMAKE_RC_COMPILE_OBJECT) set(CMAKE_RC_COMPILE_OBJECT - " /fo