mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-12 18:19:11 -06:00
Code Issues Packages Projects Releases Wiki Activity
57,333 Commits 2 Branches 390 Tags
3d1d7d2b388e8b046fcd8cbb21863a4edfe8de8a
Commit Graph

57333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
3d1d7d2b38 CMake Nightly Date Stamp 2022-05-04 00:01:09 -04:00
Brad King
e0dbca93aa Merge topic 'find_item-query-windows-registry' 
8d7e80cf3d find_* commands: add control over Windows registry views
08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View
769f25aa3c cmWindowsRegistry: enhance unicode conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7211
 2022-05-03 11:31:04 -04:00
Brad King
252fdfe6e4 Merge topic 'cuda-arch-verify' 
7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewd-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7218
 2022-05-03 11:26:40 -04:00
Brad King
e4901919e7 Merge branch 'release-3.23' 2022-05-03 11:25:09 -04:00
Brad King
29062b23cf Merge topic 'avoid-remove-empty-path' 
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
 2022-05-03 11:25:09 -04:00
Brad King
28957f7f25 Merge topic 'avoid-remove-empty-path' into release-3.23 
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
 2022-05-03 11:25:08 -04:00
Brad King
e28d0df5de Merge branch 'release-3.23' 2022-05-03 11:24:11 -04:00
Brad King
e253e57fe3 Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' 
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7220
 2022-05-03 11:24:11 -04:00
Brad King
4a215d292f Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' into release-3.23 
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7220
 2022-05-03 11:24:10 -04:00
Brad King
891266cacc Merge topic 'update-curl' 
30aba1ce8c Merge branch 'upstream-curl' into update-curl
2a9bc9ebf0 curl 2022-04-27 (1669b17d)
5239672e64 curl: Update script to get curl 7.83.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7219
 2022-05-03 11:21:54 -04:00
Brad King
386496a544 Merge topic 'cpp-modules-prep' 
c5b56b35c2 cmInstallExportGenerator: expose the temporary directory
c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning
64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type
aaa18f15cf cmTarget: add support for querying all file set names
cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt
97a68198c9 cmGlobalNinjaGenerator: escape `:` in module names
499009b79c cmTarget: avoid creating export entries if they don't exist
0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7214
 2022-05-03 11:20:26 -04:00
Kitware Robot
ef10e61b6b CMake Nightly Date Stamp 2022-05-03 00:01:05 -04:00
Kitware Robot
8dbf38eaaf CMake Nightly Date Stamp 2022-05-02 00:01:17 -04:00
Marc Chevrier
bbb51444a2 Merge topic 'enum_set-stabilization' 
f42d0c9322 cm::enum_set: fix compilation warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7222
 2022-05-01 05:44:24 -04:00
Craig Scott
c33c389f71 Merge topic 'preset-bash-completion' 
f7a6e036ad bash-completion: Support CMakePresets in cmake and ctest completion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7148
 2022-05-01 03:14:47 -04:00
Kitware Robot
5327176fc2 CMake Nightly Date Stamp 2022-05-01 00:01:04 -04:00
Kitware Robot
833e952583 CMake Nightly Date Stamp 2022-04-30 00:01:07 -04:00
Marc Chevrier
8d7e80cf3d find_* commands: add control over Windows registry views 
Fixes: #22775
 2022-04-29 22:00:02 +02:00
Brad King
71ded12a75 cmGeneratedFileStream: Do not remove empty path 
If `Close()` is called when a file was never opened, we have no
temporary file path.  Do not try to remove it.  Some implementations of
`unlink()` crash on an empty path (though the documented behavior is to
fail with `ENOENT`).

Fixes: #23414
 2022-04-29 11:56:59 -04:00
Marc Chevrier
08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View 2022-04-29 16:51:17 +02:00
Marc Chevrier
769f25aa3c cmWindowsRegistry: enhance unicode conversions 2022-04-29 16:51:17 +02:00
Marc Chevrier
f42d0c9322 cm::enum_set: fix compilation warning 2022-04-29 16:49:14 +02:00
Craig Scott
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable 
In 2a8df7e7db (productbuild: Don't write rootVolumeOnly attribute if
writing domains, 2022-03-21), the variable holding the main contents
of the distribution.dist XML file was renamed from
CPACK_PACKAGEMAKER_CHOICES to CPACK_APPLE_PKG_INSTALLER_CONTENT.
This reflected the fact that the PackageMaker generator is deprecated.
The new variable also includes more details than the old one held.
Some projects were relying on the old variable name, so we need to still
set that to the same contents as it would have previously provided.

Neither of these variables were previously documented, but the older
variable was mentioned in enough semi-official places that it essentially
became semi-supported. Document both variables and highlight that the
older one is deprecated.

Fixes: #23467
 2022-04-30 00:28:05 +10:00
Brad King
253492a6f7 Merge branch 'release-3.23' 2022-04-29 09:26:17 -04:00
Brad King
756e83fbe2 Merge topic 'doc-cmake.org-tutorial-archive' 
4cb616fed6 Tutorial: Provide a source archive when published on cmake.org
37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands
eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7215
 2022-04-29 09:26:17 -04:00
Brad King
a8c8842101 Merge topic 'doc-cmake.org-tutorial-archive' into release-3.23 
4cb616fed6 Tutorial: Provide a source archive when published on cmake.org
37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands
eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7215
 2022-04-29 09:26:16 -04:00
Brad King
7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes 
Fix the validation regex added by commit c267ed205a (CUDA: Defer
architecture testing to the compiler testing step, 2022-04-25) to
allow these values.
 2022-04-29 09:07:53 -04:00
Robin Linden
f7a6e036ad bash-completion: Support CMakePresets in cmake and ctest completion 
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2022-04-29 14:33:19 +10:00
Kitware Robot
3585d117e8 CMake Nightly Date Stamp 2022-04-29 00:01:06 -04:00
Brad King
30aba1ce8c Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-04-27 (1669b17d)
 2022-04-28 15:21:23 -04:00
Curl Upstream
2a9bc9ebf0 curl 2022-04-27 (1669b17d) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 1669b17d3a1a1fd824308544ca0ec02a2a4f50ea (curl-7_83_0).
 2022-04-28 15:15:44 -04:00
Brad King
5239672e64 curl: Update script to get curl 7.83.0 2022-04-28 15:15:34 -04:00
Brad King
4cb616fed6 Tutorial: Provide a source archive when published on cmake.org 
Provide readers following the tutorial on `cmake.org` a direct link to
download the tutorial's source examples.  Previously readers had to
fetch the CMake source tree separately and look for the tutorial source
examples inside it.

Fixes: #22475
 2022-04-28 13:36:20 -04:00
Brad King
90d5d4285b Merge topic 'doc-genex-REMOVE_DUPLICATES' 
484b992f25 Help: Clarify which items are retained by $<REMOVE_DUPLICATES:...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7217
 2022-04-28 09:49:26 -04:00
Brad King
c70482461e Merge topic 'ghs-file-type' 
158d6252cc GHS: Set LANGUAGE type for source files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7209
 2022-04-28 09:43:04 -04:00
Brad King
3b31397dc3 Merge topic 'manual-fileset-for-header-only-libraries' 
4b25a0d512 Help/manual: Update header-only library example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7198
 2022-04-28 09:38:37 -04:00
Brad King
d71d555153 Merge topic 'findmpi_dont_variable_lang' 
c9c2e040aa FindMPI: Don't check for variables named the same as the languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7208
 2022-04-28 09:37:23 -04:00
Brad King
d35f1c9bee Merge topic 'cuda-arch-verify' 
c267ed205a CUDA: Defer architecture testing to the compiler testing step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7202
 2022-04-28 09:36:31 -04:00
Ben Boeckel
c5b56b35c2 cmInstallExportGenerator: expose the temporary directory 
This needs to be known so that C++ module properties for the install can
be staged beside the other files.

Always perform the MD5 transformation (in non-bootstrap builds) so that
the path can be computed prior to generation (where it used the longest
configuration name to detect too-long paths). Update tests to expect the
always-present MD5 value. Note that this improves robustness of the test
suite as testing in a too-long path may have triggered the MD5
conversion anyways.
 2022-04-28 09:13:48 -04:00
Marc Chevrier
2fb1398b7e Merge topic 'enum_set-container' 
b13eef5a90 cm::enum_set: container that contains a set of unique enum values.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7212
 2022-04-28 07:51:59 -04:00
Kitware Robot
86472acd64 CMake Nightly Date Stamp 2022-04-28 00:01:22 -04:00
Craig Scott
484b992f25 Help: Clarify which items are retained by $<REMOVE_DUPLICATES:...> 2022-04-28 11:38:51 +10:00
Ben Boeckel
c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning 2022-04-27 18:39:01 -04:00
Brad King
37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands 2022-04-27 15:22:31 -04:00
Brad King
eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands 2022-04-27 15:22:31 -04:00
Ben Boeckel
64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type 2022-04-27 15:14:50 -04:00
Ben Boeckel
aaa18f15cf cmTarget: add support for querying all file set names 2022-04-27 15:04:01 -04:00
Ben Boeckel
cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt 2022-04-27 14:30:41 -04:00
Ben Boeckel
97a68198c9 cmGlobalNinjaGenerator: escape : in module names 
Not all filesystems support `:` in the name, so replace it with `-`. As
`-` is not otherwise allowed in module names anyways, there is no risk
of conflict.
 2022-04-27 14:30:41 -04:00
Ben Boeckel
499009b79c cmTarget: avoid creating export entries if they don't exist 2022-04-27 14:30:41 -04:00