mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,026 Commits 2 Branches 401 Tags
43372d5ba34d2a95a886f39a254870c122e98fa2
Commit Graph

49026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 43372d5ba3 Merge topic 'file-GENERATE-tmp' 
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4992
 2020-07-09 06:53:36 -04:00
Brad King a054211dd9 Merge topic 'install' 
9a25278f8c Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4988
 2020-07-09 06:52:55 -04:00
Brad King 13b5588a86 Merge topic 'FindMatlab-unknown-version' 
a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4986
 2020-07-09 06:52:01 -04:00
Brad King ed9b60e89e Merge topic 'cpack2' 
ca9bd43f2d Help: Duplicate essential information on install paths in CPack.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4987
 2020-07-09 06:51:01 -04:00
Brad King 1d0452fd3e Merge branch 'release-3.18' 2020-07-09 06:49:22 -04:00
Brad King 395ba3eb17 Merge topic 'FindJava-no-macos-stub' 
e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4993
 2020-07-09 06:49:22 -04:00
Brad King 8e71d199dc Merge topic 'FindJava-no-macos-stub' into release-3.18 
e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4993
 2020-07-09 06:49:21 -04:00
Brad King 8c477d7c61 Merge branch 'release-3.18' 2020-07-09 06:47:43 -04:00
Brad King 9165c839f8 Merge topic 'cuda-11-ptx-arch' 
8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4991
 2020-07-09 06:47:43 -04:00
Brad King e69c64a144 Merge topic 'cuda-11-ptx-arch' into release-3.18 
8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4991
 2020-07-09 06:47:42 -04:00
Brad King b507794046 Merge branch 'release-3.18' 2020-07-09 06:46:42 -04:00
Brad King 6ce96dfbc7 Merge topic 'doc-CPack-source-package' into release-3.18 
f8b7acaf90 Help: Fix CPack module docs on config file for source package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4985
 2020-07-09 06:46:41 -04:00
Brad King 10a5ba8dd8 Merge topic 'doc-CPack-source-package' 
f8b7acaf90 Help: Fix CPack module docs on config file for source package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4985
 2020-07-09 06:46:41 -04:00
Kitware Robot 6f3a5fef84 CMake Nightly Date Stamp 2020-07-09 05:30:04 -04:00
Brad King e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java 
Since commit dd378258f1 (FindJava: Do not accept OS X stub 'java' as
Java, 2014-10-24, v3.1.0-rc3~29^2) we try to avoid using the macOS
`/usr/bin/java` stub if no underlying implementation of Java is actually
installed.  However, the message that `/usr/bin/java` prints when there
is no Java available has changed since then.  Update our check to also
look for the new message.

While at it, revise the way we suppress `Java_JAVA_EXECUTABLE`.
Previously we set its cache entry to `Java_JAVA_EXECUTABLE-NOTFOUND`,
but that would cause the same find-and-reject sequence to be followed
every time CMake runs in a build tree.  Instead, use the approach from
commit 2c0db404d1 (FindSubversion: Do not accept macOS stub without
Xcode implementation, 2020-05-28, v3.18.0-rc1~67^2).  Leave the cache
entry alone and just set a normal variable of the same name to hide it.
 2020-07-08 16:17:40 -04:00
Brad King 4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo' 
Fixes: #20873
 2020-07-08 15:49:56 -04:00
Brad King eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default 
Avoid collisions with project-specified files named with `.tmp`.

Issue: #20873
 2020-07-08 15:49:56 -04:00
Brad King 09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files 
Do not depend on `cmGeneratedFileStream` to have this default.
 2020-07-08 15:49:56 -04:00
Brad King 0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension 2020-07-08 15:49:56 -04:00
zasdfg bnm 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture 2020-07-08 13:35:12 -04:00
Joachim Wuttke (h) 9a25278f8c Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION. 
as per my uncontradicted post
 https://discourse.cmake.org/t/local-install-vs-install-for-cpack-absolute-vs-relative-path/623/2?u=jwuttke
 2020-07-08 15:09:19 +02:00
Craig Scott b46da0500c Merge branch 'release-3.18' 2020-07-08 09:06:54 -04:00
Craig Scott 32e13e5291 Merge topic 'ctest-resource-spec-file-doc' 
c57695a2f4 Help: Clarify search order for resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4983
 2020-07-08 09:06:54 -04:00
Craig Scott 8adfa16e20 Merge topic 'ctest-resource-spec-file-doc' into release-3.18 
c57695a2f4 Help: Clarify search order for resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4983
 2020-07-08 09:06:53 -04:00
Joachim Wuttke (h) ca9bd43f2d Help: Duplicate essential information on install paths in CPack. 2020-07-08 14:59:01 +02:00
Alexey Kreschuk a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version 
An "unknown" version does not always mean an old version.  Setting this
macro by mistake does not result in a compilation error, but not setting
it does.  I had this error when compiling from a user that does not have
a matlab license.
 2020-07-08 08:56:10 -04:00
Joachim Wuttke (h) f8b7acaf90 Help: Fix CPack module docs on config file for source package 2020-07-08 08:36:00 -04:00
Brad King 89845851a7 Merge topic 'MissingVoid' 
075ed33750 Tests: Fix pedantic warning about missing void in C function declaration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4984
 2020-07-08 08:32:15 -04:00
Brad King fc3f932e3c Merge topic 'languageStandardMultipleBacktraceSupport' 
2f383d852d fileapi: Support multiple backtraces for language standard
cc96fb617b Add BTs helper to support multiple backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4960
 2020-07-08 08:28:46 -04:00
Brad King 6e44bd186c Merge topic 'cpack-dmg-sla' 
1ace607329 CPack/DragNDrop: Re-implement SLA attachment to avoid deprecated tools
98e0cbd8eb Tests: Verify DMG default SLA content
b33283a282 Tests: Cover using RTF for DMG SLAs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4972
 2020-07-08 08:27:57 -04:00
Brad King cb0080d520 Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18 
33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4981
 2020-07-08 08:26:43 -04:00
Brad King ec8270468f Merge branch 'release-3.18' 2020-07-08 08:26:43 -04:00
Brad King 8cbd338217 Merge topic 'FindMPI-nvcc-link-pthread' 
33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4981
 2020-07-08 08:26:43 -04:00
Brad King bc185531fa Merge topic 'cuda-11-compute-arch' into release-3.18 
295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: Tobias Ribizel <ribizel@kit.edu>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !4979
 2020-07-08 08:25:00 -04:00
Brad King 1a930ec1f0 Merge branch 'release-3.18' 2020-07-08 08:25:00 -04:00
Brad King bb451aadab Merge topic 'cuda-11-compute-arch' 
295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: Tobias Ribizel <ribizel@kit.edu>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !4979
 2020-07-08 08:25:00 -04:00
Brad King 8e9e97d4d9 Merge branch 'release-3.18' 2020-07-08 08:23:32 -04:00
Brad King 32e833d5cf Merge topic 'find-blas-lapack-mklroot-win' into release-3.18 
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4982
 2020-07-08 08:23:31 -04:00
Brad King 8a3a1cf71a Merge topic 'find-blas-lapack-mklroot-win' 
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4982
 2020-07-08 08:23:31 -04:00
Kitware Robot e9275ad1a1 CMake Nightly Date Stamp 2020-07-08 07:17:31 -04:00
Sean McBride 075ed33750 Tests: Fix pedantic warning about missing void in C function declaration 2020-07-07 14:41:28 -04:00
Kyle Edwards c57695a2f4 Help: Clarify search order for resource spec file 
Clarify the order in which --resource-spec-file, RESOURCE_SPEC_FILE,
and CTEST_RESOURCE_SPEC_FILE are searched, and add tests to
enforce this.

Fixes: #20914
 2020-07-07 12:21:58 -04:00
zasdfg bnm 295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support 
Co-Author: Henry Schreiner <henryschreineriii@gmail.com>
 2020-07-07 11:32:45 -04:00
Robert Maynard 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking 
Fixes: #20924
 2020-07-07 10:23:11 -04:00
Michael Hirsch 196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash 2020-07-07 09:55:29 -04:00
Michael Hirsch 96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash 2020-07-07 09:55:29 -04:00
Brad King ee781ac59d Merge topic 'doc-versionadded' 
496ec6036f Help: Add Sphinx 'versionadded' directives to each top-level document
0c87afceab Help/dev: Add maintainer guide step for 'versionadded' documentation markup
dbd453c2ff Utilities/Sphinx: Add script for inserting ".. versionadded" directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !4947
 2020-07-07 09:22:28 -04:00
Brad King 7911c5b0b2 Merge topic 'bootstrap-system-libuv' 
a32b5be56c bootstrap: Add option to use system libuv during bootstrap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4976
 2020-07-07 09:21:08 -04:00
Brad King b089907c2c Merge branch 'release-3.18' 2020-07-07 09:17:23 -04:00
Brad King 6bdbc7dba0 Merge topic 'cmake-gui-qt-5.14' 
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4978
 2020-07-07 09:17:23 -04:00