summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-GENERATE-tmp'Brad King2020-07-096-2/+39
|\ | | | | | | | | | | | | | | | | | | 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
| * Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'Brad King2020-07-083-0/+15
| | | | | | | | Fixes: #20873
| * cmGeneratedFileStream: Use random temporary file extension by defaultBrad King2020-07-081-1/+3
| | | | | | | | | | | | Avoid collisions with project-specified files named with `.tmp`. Issue: #20873
| * cmCTest: Explicitly specify '.tmp' extension on in-progress log filesBrad King2020-07-081-0/+1
| | | | | | | | Do not depend on `cmGeneratedFileStream` to have this default.
| * cmGeneratedFileStream: Optionally use custom temporary file extensionBrad King2020-07-082-2/+21
| |
* | Merge topic 'install'Brad King2020-07-091-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 9a25278f8c Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4988
| * | Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION.Joachim Wuttke (h)2020-07-081-0/+3
| | | | | | | | | | | | | | | as per my uncontradicted post https://discourse.cmake.org/t/local-install-vs-install-for-cpack-absolute-vs-relative-path/623/2?u=jwuttke
* | | Merge topic 'FindMatlab-unknown-version'Brad King2020-07-091-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4986
| * | | FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown versionAlexey Kreschuk2020-07-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'cpack2'Brad King2020-07-091-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca9bd43f2d Help: Duplicate essential information on install paths in CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4987
| * | | | Help: Duplicate essential information on install paths in CPack.Joachim Wuttke (h)2020-07-081-3/+7
| | |/ / | |/| |
* | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'FindJava-no-macos-stub' into release-3.18Brad King2020-07-091-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
* | \ \ \ \ Merge topic 'FindJava-no-macos-stub'Brad King2020-07-091-3/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
| * | | | | FindJava: Update check to avoid accepting macOS stub 'java' as JavaBrad King2020-07-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cuda-11-ptx-arch' into release-3.18Brad King2020-07-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
* | \ \ \ \ \ Merge topic 'cuda-11-ptx-arch'Brad King2020-07-091-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
| * | | | | | FindCUDA/select_compute_arch: generate PTX for the latest architecturezasdfg bnm2020-07-081-2/+2
| | | | | | |
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-CPack-source-package' into release-3.18Brad King2020-07-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
* | \ \ \ \ \ \ Merge topic 'doc-CPack-source-package'Brad King2020-07-091-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
| * | | | | | | Help: Fix CPack module docs on config file for source packageJoachim Wuttke (h)2020-07-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-07-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.18'Craig Scott2020-07-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ctest-resource-spec-file-doc' into release-3.18Craig Scott2020-07-088-4/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c57695a2f4 Help: Clarify search order for resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4983
* | \ \ \ \ \ \ Merge topic 'ctest-resource-spec-file-doc'Craig Scott2020-07-088-4/+41
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | c57695a2f4 Help: Clarify search order for resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4983
| * | | | | | Help: Clarify search order for resource spec fileKyle Edwards2020-07-078-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'MissingVoid'Brad King2020-07-082-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 075ed33750 Tests: Fix pedantic warning about missing void in C function declaration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4984
| * | | | | | | Tests: Fix pedantic warning about missing void in C function declarationSean McBride2020-07-072-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'languageStandardMultipleBacktraceSupport'Brad King2020-07-089-32/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | fileapi: Support multiple backtraces for language standardJustin Goshi2020-07-068-32/+102
| | | | | | | | |
| * | | | | | | | Add BTs helper to support multiple backtracesJustin Goshi2020-07-061-0/+26
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'cpack-dmg-sla'Brad King2020-07-086-240/+275
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | CPack/DragNDrop: Re-implement SLA attachment to avoid deprecated toolsBrad King2020-07-072-233/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Rez` tool has been deprecated since Xcode 6. The `hdiutil flatten` and `hdiutil unflatten` tools have been deprecated since macOS 10.15 and are removed in macOS 11. Instead use `hdiutil udifrez` to attach the SLA resources to disk images. This tool accepts XML input files, so convert our resource file generation to produce that format. Fixes: #20889
| * | | | | | | | Tests: Verify DMG default SLA contentBrad King2020-07-031-0/+16
| | | | | | | | |
| * | | | | | | | Tests: Cover using RTF for DMG SLAsBrad King2020-07-033-7/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18Brad King2020-07-081-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
* | | | | | | | | Merge topic 'FindMPI-nvcc-link-pthread'Brad King2020-07-081-0/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
| * | | | | | | | FindMPI: Pass -pthread to NVCC through -Xlinker for device linkingRobert Maynard2020-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20924
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cuda-11-compute-arch' into release-3.18Brad King2020-07-081-7/+27
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'cuda-11-compute-arch'Brad King2020-07-081-7/+27
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindCUDA/select_compute_arch: Add CUDA 11 and Ampere supportzasdfg bnm2020-07-071-7/+27
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Henry Schreiner <henryschreineriii@gmail.com>
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'find-blas-lapack-mklroot-win' into release-3.18Brad King2020-07-082-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'find-blas-lapack-mklroot-win'Brad King2020-07-082-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | FindLAPACK: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| | | | | | | | |
| * | | | | | | | FindBLAS: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| | |/ / / / / / | |/| | | | | |