mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,000 Commits 2 Branches 391 Tags
32e13e52916617618d9036440a70fd464ba2ad87
Commit Graph

49000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
1a930ec1f0 Merge branch 'release-3.18' 2020-07-08 08:25:00 -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
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
Brad King
dab33d1e33 Merge topic 'cmake-gui-qt-5.14' into release-3.18 
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:22 -04:00
Brad King
996b312825 Merge topic 'FindMPI-nvcc-fexceptions' into release-3.18 
b725a19072 FindMPI: Deny -fexceptions from NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4970
 2020-07-07 09:13:49 -04:00
Brad King
8efbe9f4fe Merge branch 'release-3.18' 2020-07-07 09:13:49 -04:00
Brad King
096093356c Merge topic 'FindMPI-nvcc-fexceptions' 
b725a19072 FindMPI: Deny -fexceptions from NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4970
 2020-07-07 09:13:49 -04:00
Brad King
1ace607329 CPack/DragNDrop: Re-implement SLA attachment to avoid deprecated tools 
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
 2020-07-07 08:08:21 -04:00
Kitware Robot
ce4ed6219a CMake Nightly Date Stamp 2020-07-07 00:02:09 -04:00
Justin Goshi
2f383d852d fileapi: Support multiple backtraces for language standard 2020-07-06 11:40:39 -07:00
Justin Goshi
cc96fb617b Add BTs helper to support multiple backtraces 2020-07-06 11:31:09 -07:00
Julien Schueller
a32b5be56c bootstrap: Add option to use system libuv during bootstrap 
Support bootstrapping on older systems where our bundled
version libuv does not compile (.e.g Centos5, see #19086 and #19311).
Add a `--bootstrap-system-libuv` option to use the system-provided
libuv even for the bootstrap binary itself.
 2020-07-06 13:00:57 -04:00
Brad King
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14 
Fix code added by commit d7679f6427 (QCMakeCacheView: use non-deprecated
List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2), used
conditionally on Qt 5.14 or above, to compile as C++14.
 2020-07-06 11:45:03 -04:00
Kitware Robot
496ec6036f Help: Add Sphinx 'versionadded' directives to each top-level document 
Run the `Utilities/Sphinx/update_versions.py` script to add initial
markup to every top-level document and find module.

Issue: #19715
 2020-07-06 10:23:20 -04:00
Brad King
0c87afceab Help/dev: Add maintainer guide step for 'versionadded' documentation markup 2020-07-06 10:11:24 -04:00
Brad King
26c1271159 Merge branch 'release-3.18' 2020-07-06 09:42:42 -04:00
Brad King
2e029b1d36 Merge branch 'cmext-vs16-declval' into release-3.18 
Merge-request: !4971
 2020-07-06 09:42:21 -04:00
Axel Huebl
b725a19072 FindMPI: Deny -fexceptions from NVCC 
Do not forward -fexceptions (set from MVAPICH2) to NVCC.

Fixes: #18558
 2020-07-06 09:37:11 -04:00
Sumit Bhardwaj
8843946519 cmext: Implement cm::static_reference_cast by declval 
Previously, `cm::static_reference_cast` used `invoke_result_t` and took
the address of `O::get`. This is not in complete conformance with
standard.

Change the implementation to use `std::declval<O>.get()` which is always
well-defined.
 2020-07-06 09:30:56 -04:00
Marc Chevrier
c17167cdcb Merge topic 'sumitb/vs16' 
782d7387d5 Implement cm::static_reference_cast by declval

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4971
 2020-07-06 09:28:57 -04:00
Brad King
a4cfc7d03c Merge topic 'refactor-generator-configs' 
7a969fe21d cmMakefile: Refactor API to better handle empty config values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4957
 2020-07-06 09:28:11 -04:00
Brad King
ab46e71eeb Merge topic 'cmStandardLevelResolver-refactor' 
49f3e0ab6f cmStandardLevelResolver: Refactor to remove duplicate code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4966
 2020-07-06 09:27:19 -04:00
Brad King
4023ee3b56 Merge branch 'release-3.18' 2020-07-06 09:24:48 -04:00
Brad King
9e1cd8ea45 Merge topic 'doc-file_ARCHIVE_synopsis' 
f9766dad19 Help: Update file(ARCHIVE...) synopsis for renamed options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4977
 2020-07-06 09:24:48 -04:00
Brad King
948925f416 Merge topic 'doc-file_ARCHIVE_synopsis' into release-3.18 
f9766dad19 Help: Update file(ARCHIVE...) synopsis for renamed options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4977
 2020-07-06 09:24:47 -04:00
Craig Scott
f9766dad19 Help: Update file(ARCHIVE...) synopsis for renamed options 
The FILES and DIRECTORY options were renamed in bbcff21f71
(file(ARCHIVE*): Collapse FILES and DIRECTORY options, 2020-06-30), 
but the synopsis part of the file() documentation was missed.
The synopsis also typically only shows the mandatory options.
Update the synopsis to reflect the name changes and omit the
DESTINATION option since it is not mandatory.
 2020-07-06 20:15:09 +10:00
Craig Scott
44a5ee6615 Merge branch 'release-3.18' 2020-07-06 05:53:05 -04:00
Craig Scott
6180d99148 Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG' into release-3.18 
3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4973
 2020-07-06 05:53:05 -04:00
Craig Scott
a0bca7e9cc Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG' 
3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4973
 2020-07-06 05:53:05 -04:00