mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,231 Commits 2 Branches 401 Tags
affd8b09e68e0e64ab391f11a26e58ba439c39fb
Commit Graph

54231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King affd8b09e6 Merge topic 'vs10-deprecate' 
22dab6eb96 Deprecate Visual Studio 10 2010 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6412
 2021-08-03 11:10:43 -04:00
Brad King 792c2eac10 Merge topic 'irsl-intel' 
f4c194398d IRSL: Avoid duplication of Intel redist lib folder paths
2adc45c7f6 IRSL: Fix check of path to Intel redistdir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6414
 2021-08-03 11:09:42 -04:00
Brad King 70daea512d Merge topic 'string-TIMESTAMP-specifier-V' 
aafa392c12 string(TIMESTAMP): Add %V specifier for ISO 8601 week number
a915f691ad Help: Format string(TIMESTAMP) format specifiers as a definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6374
 2021-08-03 11:08:34 -04:00
Brad King a3ddcdb911 Merge topic 'nsis_ignore_license_page' 
795e406e3b CPack/NSIS: Add option to not display license page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6422
 2021-08-03 11:06:45 -04:00
Brad King 1524505e12 Merge topic 'minimal_nsis' 
c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6425
 2021-08-03 11:05:39 -04:00
Brad King ff56e78bea Merge topic 'cpack_deb_zstd' 
051da997da CPack/DEB: Add zstd compression for deb packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6394
 2021-08-03 11:04:27 -04:00
Brad King 6edf3133ad Merge topic 'FindX11-more-advanced-variables' 
076d0a1710 FindX11: mark more xcb variables as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6424
 2021-08-03 11:03:35 -04:00
Brad King 64e8d23caf Merge topic 'gate-vtk-compat' 
7391363302 VTKCompatibility: ignore for "modern" VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6413
 2021-08-03 11:02:23 -04:00
Brad King 631e017f29 Merge branch 'release-3.21' 2021-08-03 11:01:08 -04:00
Brad King a6eadb8031 Merge topic 'cpack-rpm-pre-semicolon' 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King fbf5a368c9 Merge topic 'cpack-rpm-pre-semicolon' into release-3.21 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King 2d7015fd3e Merge branch 'release-3.21' 2021-08-03 10:59:38 -04:00
Brad King 54be23df7f Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into release-3.21 
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King e251bf5f68 Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' 
9e7a0568f6 Merge branch 'backport-3.21-CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King aa1426da4a Merge topic 'help-get_filename_path-fix-version-changed' into release-3.21 
8b28fe5670 Help: get_filename_component: fix version info for cmake_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6423
 2021-08-03 10:57:44 -04:00
Brad King b554d08c9b Merge branch 'release-3.21' 2021-08-03 10:57:44 -04:00
Brad King cf49b5fb6b Merge topic 'help-get_filename_path-fix-version-changed' 
8b28fe5670 Help: get_filename_component: fix version info for cmake_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6423
 2021-08-03 10:57:44 -04:00
Kitware Robot 4deb7c250b CMake Nightly Date Stamp 2021-08-03 00:01:12 -04:00
Alexander Grund f4c194398d IRSL: Avoid duplication of Intel redist lib folder paths 2021-08-02 15:34:19 -04:00
Alexander Grund 2adc45c7f6 IRSL: Fix check of path to Intel redistdir 
Fix a cut-n-paste error from commit fd4406f33e (IRSL: Add Intel compiler
support, 2017-08-16, v3.10.0-rc1~187^2).  Make the checked and used
paths match.
 2021-08-02 15:34:09 -04:00
Johnny Jazeix c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03 
Fixes: #22508
 2021-08-02 21:28:30 +02:00
Brad King e2fe042bad Merge topic 'cpack_debug_doc' 
008d55df76 CPack/DEB+RPM: Update documentation on debug symbol package creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6393
 2021-08-02 15:12:09 -04:00
Brad King 0660dc4dcf Merge topic 'find_cudatoolkit_understand_nvhpc_math_library_location' 
d856aaa37d FindCUDAToolkit: Understand NVHPC versioned math library layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6405
 2021-08-02 15:09:43 -04:00
Brad King 0194918636 Merge topic 'ghs_generator_bashism_fix' 
172475b2c5 GHS: Remove bashism from custom command shell scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6409
 2021-08-02 15:08:49 -04:00
Artur Samarin 3cdf23985f CPackRPM: avoid a spurious ; in the %pre and other sections with scripts 
This was accidentally added by commit 34c8a23044 (CPackRPM: add
scriplets tags only if scripts exist, 2021-04-01, v3.21.0-rc1~387^2).

Fixes: #22501
 2021-08-02 15:04:22 -04:00
Brad King e9b8d6fdbc Merge topic 'vs-iface-include-dirs' into release-3.21 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King 00d2762fd5 Merge branch 'release-3.21' 2021-08-02 14:07:13 -04:00
Brad King 99d3e20999 Merge topic 'vs-iface-include-dirs' 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King d14a1ae859 Merge topic 'nvhpc-MD-flag' into release-3.21 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King 9faefbc67c Merge branch 'release-3.21' 2021-08-02 14:05:34 -04:00
Brad King b65378878b Merge topic 'nvhpc-MD-flag' 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King 00535bab00 Merge topic 'autogen-ui-header-depends' into release-3.21 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Brad King e382ef0e23 Merge branch 'release-3.21' 2021-08-02 14:04:08 -04:00
Brad King bae8437895 Merge topic 'autogen-ui-header-depends' 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Ben Boeckel 7391363302 VTKCompatibility: ignore for "modern" VTK 
Modern versions which use the module system really don't need any of the
hacks needed here.
 2021-08-02 10:45:31 -04:00
Ben Boeckel 076d0a1710 FindX11: mark more xcb variables as advanced 2021-08-02 10:40:57 -04:00
Marc Chevrier 519ce95584 Merge topic 'fix_stanardlevelcomputer_typo' 
8d5052fdc4 cmStandardLevelResolver: Fixed typo in struct name + clang-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6419
 2021-08-02 10:32:13 -04:00
Antons Jeļkins aafa392c12 string(TIMESTAMP): Add %V specifier for ISO 8601 week number 
In ISO 8601 weeks begin with Monday. The first week of
the year is the week which contains the first Thursday
of the year.
 2021-08-02 16:31:53 +02:00
Marc Chevrier 8b28fe5670 Help: get_filename_component: fix version info for cmake_path 
Fixes: #22505
 2021-08-02 11:12:46 +02:00
Craig Scott 28ce8a932d Merge topic 'doc-dmg-filesystem' into release-3.21 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott c62e1a4e51 Merge branch 'release-3.21' 2021-08-02 04:56:23 -04:00
Craig Scott 800abe1337 Merge topic 'doc-dmg-filesystem' 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott 6fb63e56df Merge topic 'doc-presets-toolchain-file' into release-3.21 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Craig Scott fc1556c540 Merge branch 'release-3.21' 2021-08-02 04:54:49 -04:00
Craig Scott bc44c32773 Merge topic 'doc-presets-toolchain-file' 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Kitware Robot 09217f2779 CMake Nightly Date Stamp 2021-08-02 00:01:15 -04:00
Johnny Jazeix 795e406e3b CPack/NSIS: Add option to not display license page 
Fixes: #22215
 2021-08-01 18:28:47 +02:00
Marc Chevrier 9e7a0568f6 Merge branch 'backport-3.21-CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER 2021-08-01 15:26:21 +02:00
Marc Chevrier 213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER 
Fixes: #22486
 2021-08-01 15:24:16 +02:00
Kitware Robot 0a6415ea1f CMake Nightly Date Stamp 2021-08-01 00:02:11 -04:00