summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'nsis_ignore_license_page'Brad King2021-08-036-1/+30
|\ | | | | | | | | | | | | 795e406e3b CPack/NSIS: Add option to not display license page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6422
| * CPack/NSIS: Add option to not display license pageJohnny Jazeix2021-08-016-1/+30
| | | | | | | | Fixes: #22215
* | Merge topic 'minimal_nsis'Brad King2021-08-033-4/+8
|\ \ | | | | | | | | | | | | | | | | | | c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6425
| * | CPack/NSIS: Bump minimal version of NSIS to 3.03Johnny Jazeix2021-08-023-4/+8
| | | | | | | | | | | | Fixes: #22508
* | | Merge topic 'cpack_deb_zstd'Brad King2021-08-033-4/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack/DEB: Add zstd compression for deb packagesRussell Greene2021-07-293-4/+26
| | | |
* | | | Merge topic 'FindX11-more-advanced-variables'Brad King2021-08-031-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 076d0a1710 FindX11: mark more xcb variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6424
| * | | | FindX11: mark more xcb variables as advancedBen Boeckel2021-08-021-0/+6
| | | | |
* | | | | Merge topic 'gate-vtk-compat'Brad King2021-08-031-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7391363302 VTKCompatibility: ignore for "modern" VTK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6413
| * | | | | VTKCompatibility: ignore for "modern" VTKBen Boeckel2021-08-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern versions which use the module system really don't need any of the hacks needed here.
* | | | | | Merge branch 'release-3.21'Brad King2021-08-030-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'cpack-rpm-pre-semicolon' into release-3.21Brad King2021-08-031-3/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ Merge topic 'cpack-rpm-pre-semicolon'Brad King2021-08-031-3/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scriptsArtur Samarin2021-08-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.21'Brad King2021-08-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into ↵Brad King2021-08-033-2/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.21 213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6421
* | \ \ \ \ \ \ \ Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER'Brad King2021-08-033-2/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ Merge branch ↵Marc Chevrier2021-08-013-2/+33
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | 'backport-3.21-CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER
| | * | | | | | | add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILERMarc Chevrier2021-08-013-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22486
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'help-get_filename_path-fix-version-changed' into release-3.21Brad King2021-08-031-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b28fe5670 Help: get_filename_component: fix version info for cmake_path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6423
* | | | | | | | | Merge topic 'help-get_filename_path-fix-version-changed'Brad King2021-08-031-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b28fe5670 Help: get_filename_component: fix version info for cmake_path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6423
| * | | | | | | | Help: get_filename_component: fix version info for cmake_pathMarc Chevrier2021-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22505
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-08-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cpack_debug_doc'Brad King2021-08-022-0/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 008d55df76 CPack/DEB+RPM: Update documentation on debug symbol package creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6393
| * | | | | | | | CPack/DEB+RPM: Update documentation on debug symbol package creationRussell Greene2021-07-292-0/+13
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to elaborate on the behavior between `.ddeb` creation, CPACK_STRIP_FILES, and if the files are actually stripped. Closes: #22438
* | | | | | | | Merge topic 'find_cudatoolkit_understand_nvhpc_math_library_location'Brad King2021-08-021-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | FindCUDAToolkit: Understand NVHPC versioned math library layoutRobert Maynard2021-07-281-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVHPC packages bundle the CUDA math libraries in a sibling directory (`math_libs`) instead of in with the rest of the cuda libraries. Depending on the NVHPC package the math_libs folder can have versioned subdirectories, therefore we prefer finding the same versions as the CUDA Toolkit and falling back to the latest when not possible.
* | | | | | | | Merge topic 'ghs_generator_bashism_fix'Brad King2021-08-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 172475b2c5 GHS: Remove bashism from custom command shell scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6409
| * | | | | | | | GHS: Remove bashism from custom command shell scriptsLawrence A2021-07-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'vs-iface-include-dirs' into release-3.21Brad King2021-08-023-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6411
* | \ \ \ \ \ \ \ \ Merge topic 'vs-iface-include-dirs'Brad King2021-08-023-0/+11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6411
| * | | | | | | | | VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE librariesBrad King2021-07-293-0/+11
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4391913133 (Add INTERFACE libraries to generated buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1), the VS generator may process INTERFACE libraries. Avoid code paths in the generator that process include directories because they should not be used by INTERFACE libraries since they do not compile anything. Fixes: #22494
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'nvhpc-MD-flag' into release-3.21Brad King2021-08-023-10/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6408
* | \ \ \ \ \ \ \ \ Merge topic 'nvhpc-MD-flag'Brad King2021-08-023-10/+12
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6408
| * | | | | | | | | NVHPC: Support 21.07 change to '-MD' where it behaves like gccRobert Maynard2021-07-293-10/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'autogen-ui-header-depends' into release-3.21Brad King2021-08-024-2/+33
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'autogen-ui-header-depends'Brad King2021-08-024-2/+33
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | AUTOUIC: Add test for cyclic dependency between UI headers and timestampAlexey Edelev2021-07-284-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up test for the commit 9cebdbec.
* | | | | | | | Merge topic 'fix_stanardlevelcomputer_typo'Marc Chevrier2021-08-021-12/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d5052fdc4 cmStandardLevelResolver: Fixed typo in struct name + clang-format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6419
| * | | | | | | | cmStandardLevelResolver: Fixed typo in struct name + clang-formatJaak Ristioja2021-07-311-12/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.21'Craig Scott2021-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'doc-dmg-filesystem' into release-3.21Craig Scott2021-08-021-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6416
* | \ \ \ \ \ \ \ \ Merge topic 'doc-dmg-filesystem'Craig Scott2021-08-021-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6416
| * | | | | | | | | Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEMCraig Scott2021-07-311-0/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.21'Craig Scott2021-08-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'doc-presets-toolchain-file' into release-3.21Craig Scott2021-08-021-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6417