summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | Merge topic 'doc-presets-toolchain-file'Craig Scott2021-08-021-2/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6417
| * | | | | | | Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILECraig Scott2021-07-311-2/+3
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2021-08-021-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-08-011-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-07-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-07-301-1/+1
| | | | |
* | | | | Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge topic 'haiku-platform' into release-3.21Brad King2021-07-291-5/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1261ce917 Platform/Haiku: Remove the include-once behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6401
* | \ \ \ \ Merge topic 'haiku-platform'Brad King2021-07-291-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a1261ce917 Platform/Haiku: Remove the include-once behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6401
| * | | | | Platform/Haiku: Remove the include-once behaviorJessica Hamilton2021-07-291-5/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior was added by commit 7ebc1cb2ff (Haiku: Several fixes to platform module, 2013-10-05, v3.0.0-rc1~541^2~3), but was not explained in its commit message. No other platform modules do this. The include-once behavior results in incorrect variables set in some larger projects, e.g. .NET Core, particularly when cross-compiling, `CMAKE_DL_LIBS` being one of these. Remove it.
* | | | | Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cuda_separable_clang_make' into release-3.21Brad King2021-07-297-45/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3975678fcc CUDA/Clang: Simplify --register-link-binaries logic 0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6400
* | \ \ \ \ Merge topic 'cuda_separable_clang_make'Brad King2021-07-297-45/+56
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3975678fcc CUDA/Clang: Simplify --register-link-binaries logic 0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6400
| * | | | | CUDA/Clang: Simplify --register-link-binaries logicroot2021-07-292-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic for appending cubin afterwards, so the check can simply be empty(). With the Makefile generator the option is now at the front instead of being intermixed with the actual bins.
| * | | | | CUDA/Clang: Fix separable compilation in non-root directories with Makefilesroot2021-07-296-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems the relative paths were wrong basically all around such that only compiling files in the top-level directory would work. I've modified CudaOnly.SeparateCompilation to cover this. Fixes #22482.
* | | | | | Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
generated by cgit v0.12 at 2025-09-15 09:42:48 (GMT)