summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* BinUtils: Avoid searching CMAKE_PREFIX_PATHCristian Adam2021-08-093-3/+7
| | | | | | | | | Our `find_program` calls specify `HINTS` to look in the toolchain's directory first, and then in `PATH`. `CMAKE_PREFIX_PATH` may be specified by the user to help find packages for project dependencies, but this should not override the binutils. Fixes: #22512
* Merge topic 'ninja-lwyu-ar' into release-3.21Brad King2021-08-065-1/+14
|\ | | | | | | | | | | | | 93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6418
| * Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static librariesĐoàn Trần Công Danh2021-08-035-1/+14
| | | | | | | | | | | | | | | | | | | | | | In commit d7159f9591, (Ninja: Fix LINK_WHAT_YOU_USE link flag placement, 2021-06-24), we fixed usage of -Wl,--no-as-needed to override -Wl,--as-needed from LDFLAGS. However, that change also passes -Wl,--no-as-needed to `ar`, which is incorrect flag for `ar`. Let's check the target type before passing down the flags. Fixes: #22487
* | Merge branch 'release-3.20' into release-3.21Brad King2021-08-060-0/+0
|\ \
| * \ Merge branch 'macos-10.4' into release-3.20Brad King2021-08-021-1/+3
| |\ \ | | | | | | | | | | | | Merge-request: !6426
* | \ \ Merge topic 'macos-10.4' into release-3.21Brad King2021-08-061-1/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6426
| * | | macOS: Restore support for Mac OS X 10.4 (Tiger)Evan Miller2021-08-021-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4aed96e230 (Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too, 2021-04-06, v3.20.1~5^2) we always enable support for linking with `-rpath`. The intention of the change was to enable using the flag on iOS, tvOS and watchOS by avoiding a Darwin-specific version check. However, removing the check broke support for OS X 10.4 because the flag is not supported on that version. Restore a form of the check that disables the flag on OS X < 10.5 while still allowing it for the other Apple platforms. Since no one is doing iOS/tvOS/etc development on 10.4, this change should have no unintended side effects. Fixes: #22490
* | | 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
| * | | 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 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
| * | | | add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILERMarc Chevrier2021-08-013-2/+33
| | | | | | | | | | | | | | | | | | | | Fixes: #22486
* | | | | 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
| * | | | Help: get_filename_component: fix version info for cmake_pathMarc Chevrier2021-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #22505
* | | | | 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
| * | | | | 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 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
| * | | | | NVHPC: Support 21.07 change to '-MD' where it behaves like gccRobert Maynard2021-07-293-10/+12
| |/ / / /
* | | | | 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
| * | | | 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 '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
| * | | | | Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEMCraig Scott2021-07-311-0/+2
| | |/ / / | |/| | |
* | | | | 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
| * | | | Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILECraig Scott2021-07-311-2/+3
|/ / / /
* | | | 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
| * | | | 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 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
| * | | | 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 topic 'ctest-test-changing-labels' into release-3.21Brad King2021-07-293-5/+21
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 26170ea306 CTest: Reset multi-options to persistent multi-options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6403
| * | | CTest: Reset multi-options to persistent multi-optionsKyle Edwards2021-07-283-5/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | 44ad3f0b added multi-options to CTest, but didn't reset them, causing ctest_test() to fail if it was run multiple times with different label arguments. Reset the multi-options. Fixes: #22485
* | | Merge topic 'cmake-presets-v2-inherit-v3-optional' into release-3.21Brad King2021-07-285-5/+25
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 3e42bf3e05 CMakePresets: Check presets with their own file version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6398
| * | CMakePresets: Check presets with their own file versionKyle Edwards2021-07-275-5/+25
|/ / | | | | | | | | | | | | | | | | 06e6981 added support for optional binaryDir and generator, but use the dependent preset's file version instead of the current preset's file version. Check presets with their own file version instead of their dependent's file version. Fixes: #22428
* | CMake 3.21.1v3.21.1Brad King2021-07-271-1/+1
| |
* | Merge topic 'FindXCTest-xcode-12.5' into release-3.21Brad King2021-07-274-6/+35
|\ \ | | | | | | | | | | | | | | | | | | 0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6379
| * | FindXCTest: Fix output directory for test bundle with Xcode 12.5Yauheni Khnykin2021-07-264-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | The fix from commit eafe740ead (FindXCTest: Fix output directory for test bundle with new build system, 2021-02-09, v3.19.5~5^2) is not necessary with Xcode 12.5, which seems to have changed/fixed the behaviour again. Fixes: #22462
* | | Merge topic 'disable-exec-info' into release-3.21Brad King2021-07-271-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | aa4c30182b Add option to explicitly avoid using execinfo for backtraces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6386
| * | | Add option to explicitly avoid using execinfo for backtracesĐoàn Trần Công Danh2021-07-261-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | backtrace(3) from libexecinfo in musl will run into crash [1]. Provide an option to disable it explicitly even if libexecinfo is present. 1: https://www.openwall.com/lists/musl/2021/07/17/1
* | | Merge topic 'vs-flag-FS' into release-3.21Brad King2021-07-272-56/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143 8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Niels Dekker <niels_dekker_address_until_2024@xs4all.nl> Merge-request: !6390
| * | | VS: Remove C++ module CompileAs flag table entries for v142 and v143Brad King2021-07-262-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CompileAs` entry in a `.vcxproj` file with values: * `CompileAsCppModule` for `-interface` * `CompileAsCppModuleInternalPartition` for `-internalPartition` * `CompileAsHeaderUnit` for `-exportHeader` does not cause the corresponding flag to be added to the command line. Drop the flag table entries so that the flags go to `AdditionalOptions`. Fixes: #22477
| * | | VS: Remove cl /FS entry from flag table for v142 and v143Brad King2021-07-262-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ForceSynchronousPDBWrites` entry in a `.vcxproj` file does not actually cause the `/FS` flag to be added to the command line. Fixes: #22476
* | | | Merge topic 'test-compile-options-none' into release-3.21Brad King2021-07-271-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6385
| * | | Tests/CompileOptions: allow CMAKE_BUILD_TYPE=NoneĐoàn Trần Công Danh2021-07-261-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In the same spirit of commit ce1cadd35a, (Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE, 2021-04-01). Allow distributions' check to pass seemlessly. Issue: #22470
* | | Merge topic 'update-kwsys' into release-3.21Brad King2021-07-262-4/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4977184128 Merge branch 'upstream-KWSys' into update-kwsys 7fc3f7001a KWSys 2021-07-26 (d5fd6ca2) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6391
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-07-262-4/+6
| |\ \ |/ / / | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-07-26 (d5fd6ca2)
| * | KWSys 2021-07-26 (d5fd6ca2)KWSys Upstream2021-07-262-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit d5fd6ca2ba5b4ca04d7ac346ceb87f7d2b0ad8aa (master). Upstream Shortlog ----------------- Dženan Zukić (1): 7079df74 SystemTools: Fix GetOperatingSystemNameAndVersion empty string return Đoàn Trần Công Danh (1): 4e69b791 SystemInformation: Add option to explicitly avoid using execinfo
* | | Merge topic 'doc-custom-command-depfiles' into release-3.21Brad King2021-07-261-18/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f6e5743d0e Help: Clarify and correct wording around DEPFILE option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6387
| * | | Help: Clarify and correct wording around DEPFILE optionCraig Scott2021-07-241-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous wording contradicted itself regarding whether Visual Studio generators were supported, and about when generator expressions could be used. Restructure the paragraphs and max it clearer what support was added in which CMake versions.
* | | | Merge topic 'ninja-multi-test-fix' into release-3.21Brad King2021-07-2618-6/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08131e83bc Tests: Clean up Ninja Multi-Config test from cb777dd Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6383
| * | | | Tests: Clean up Ninja Multi-Config test from cb777ddKyle Edwards2021-07-2318-6/+127
| | | | |
* | | | | Merge topic 'autouic-header-depends' into release-3.21Brad King2021-07-2615-83/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5ec0e52f4 AUTOUIC: Fix generating of dependency rules for UI header files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6380
generated by cgit v0.12 at 2025-09-11 06:34:45 (GMT)