summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2Brad King2021-10-052-2/+3
| | | | Fixes: #22721
* Merge topic 'testdriver-old-cast-warning' into release-3.21Brad King2021-10-051-1/+1
|\ | | | | | | | | | | | | ba54092842 TestDriver: Fix old-style-cast warning in C++ mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6590
| * TestDriver: Fix old-style-cast warning in C++ modeSylvain Joubert2021-10-041-1/+1
|/ | | | | | A C-style cast was added by commit 3f6ff4b5db (create_test_sourcelist: add test driver option to run all tests, 2021-04-27, v3.21.0-rc1~257^2). Use our `CM_CAST` macro to adapt based on the language.
* Merge topic 'FortranCInterface-timestamp-check' into release-3.21Brad King2021-10-041-2/+1
|\ | | | | | | | | | | | | | | 2a00e5072d FortranCInterface: Fix regression in timestamp check Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !6581
| * FortranCInterface: Fix regression in timestamp checkSeth R Johnson2021-10-011-2/+1
| | | | | | | | | | | | | | | | | | Since commit d7c8030541 (FortranCInterface: Fix misuse of IS_NEWER_THAN in timestamp check, 2021-02-21, v3.21.0-rc1~631^2~3), FortranCInterface checks for `Output.cmake.in` in the build tree instead of the source tree as before. This caused it to always re-run the detection. Fixes: #22709
* | Merge topic 'autogen-dep-on-imported-implib-only-target' into release-3.21Brad King2021-09-276-1/+85
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets 354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6558
| * | cmQtAutoGenInitializer: support IMPLIB-only imported targetsBen Boeckel2021-09-241-1/+10
| | | | | | | | | | | | | | | | | | | | | Instead of using the target name directly (which ends up in the `Ninja` generators querying for the `LOCATION` parameter), wrap up the target name in a `$<TARGET_LINKER_FILE:>` to avoid the query for the unset property.
| * | Tests/RunCMake/Autogen: test CMP0111 behaviorBen Boeckel2021-09-245-0/+75
| |/ | | | | | | | | | | | | On Windows, imported shared libraries which only have an `IMPORTED_IMPLIB` set fail if they are depended upon by a target using automoc. Add a test for the behavior of depending upon all imported target types from an automoc-using target.
* | Merge topic 'FindMatlab-r2021b' into release-3.21Brad King2021-09-241-0/+1
|\ \ | |/ |/| | | | | | | | | a013404f43 FindMatlab: Add R2021b => 9.11 version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6556
| * FindMatlab: Add R2021b => 9.11 versionMichael Hirsch2021-09-231-0/+1
|/ | | | R2021b released 09/22/2021.
* CMake 3.21.3v3.21.3Brad King2021-09-201-1/+1
|
* Merge topic 'hip-no-hipcc' into release-3.21Brad King2021-09-2023-306/+114
|\ | | | | | | | | | | | | | | | | | | | | | | | | cb93f72624 HIP: Simplify detection of HIP runtime CMake package a71f0fc9c7 HIP: Remove ROMClang compiler id and use Clang directly b125e9809a HIP: Detect ROCm path earlier 735f41fc2d HIP: Use 'rocm_agent_enumerator' to determine CMAKE_HIP_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !6533
| * HIP: Simplify detection of HIP runtime CMake packageBrad King2021-09-166-125/+29
| | | | | | | | | | | | | | It only makes sense to use the CMake package from the same ROCm installation that the compiler uses. Ask the HIP compiler to report the location of the ROCm installation. Verify up front that it contains the expected CMake package file.
| * HIP: Remove ROMClang compiler id and use Clang directlyBrad King2021-09-1617-166/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bd844387df (ROCMClang: Add the ROCm toolkit derived clang compiler to CMake, 2020-08-28, v3.21.0-rc1~66^2~6) and commit ff0d2858e1 (HIP: Extract clang compiler details from hipcc, 2020-10-21, v3.21.0-rc1~66^2~5), the separate `ROCMClang` compiler id for `hipcc` has caused a few problems: * The compiler id changed from behavior of CMake 3.20 and below, breaking projects that already built with `hipcc` treated as `Clang`. * The implementation of `target_compile_features` was incomplete for the `ROCMClang` identity. * Only `hipcc` was identified as `ROCMClang`, so after it is unwrapped to the underlying `clang++`, future runs of new CMake versions on an existing build tree would not repeat this. * Clang should be usable as a HIP compiler without the `hipcc` wrapper. Remove the `ROMClang` compiler identity, and revise HIP language support to work directly with a Clang compiler. Reject direct `hipcc` usage as a HIP compiler. For now it cannot be supported because it interferes with flags CMake needs to pass to Clang. Fixes: #22536, #22460, #22593
| * HIP: Detect ROCm path earlierBrad King2021-09-163-15/+18
| | | | | | | | | | | | | | | | | | Fail early if it is not found. Use the detected location as a hint to find `rocm_agent_enumerator`. Also remove the leading `_` prefix in case we want to document this publicly later.
| * HIP: Use 'rocm_agent_enumerator' to determine CMAKE_HIP_ARCHITECTURESZack Galbreath2021-09-162-4/+36
| |
* | Merge branch 'release-3.20' into release-3.21Brad King2021-09-201-2/+2
|\ \
| * | CMake 3.20.6v3.20.6Brad King2021-09-202-3/+3
| | |
* | | Merge branch 'release-3.20' into release-3.21Brad King2021-09-170-0/+0
|\ \ \ | |/ /
| * | Merge branch 'android-PATH' into release-3.20Brad King2021-09-161-5/+0
| |\ \ | | | | | | | | | | | | Merge-request: !6528
* | \ \ Merge topic 'android-PATH' into release-3.21Brad King2021-09-171-5/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 94f3776774 Android: Restore searching PATH for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6528
| * | | Android: Restore searching PATH for executableshhb2021-09-161-5/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13, v3.20.0-rc1~610^2), we turn off `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`. This breaks `find_program` searching `PATH` for host executables. Fortunately, the setting turns out not to be necessary, perhaps since commit cbc51a8be3 (Android: restructure android search paths, 2020-11-06, v3.20.0-rc1~509^2). Without it, none of NDK tests fail, so remove it to restore pre-3.20 behavior. Fixes: #22634
* | | Merge topic 'iar-enable-in-list-operator' into release-3.21Brad King2021-09-171-0/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | f77ffbc0e3 IAR: Restore support for projects not enabling policy CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6527
| * | IAR: Restore support for projects not enabling policy CMP0057Jean-Marc Hengen2021-09-161-0/+5
|/ / | | | | | | | | | | | | | | | | Since commit 5b9bfe738c (IAR: Moved search logic to BinUtils., 2021-07-19, v3.21.1~14^2), we use the `IN_LIST` operator in the `CMakeFindBinUtils` module. Set policy `CMP0057` to ensure it is available regardless of the project's policy settings. Fixes: #22640
* | Merge topic 'vs2022' into release-3.21Brad King2021-09-164-3/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4 f200f4d5a7 VS: Fix managed C++ project generation for VS 2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6524
| * | VS: Update Visual Studio 17 2022 generator for Preview 4Brad King2021-09-152-3/+9
| | |
| * | VS: Fix managed C++ project generation for VS 2022Brad King2021-09-152-0/+10
|/ / | | | | | | | | | | | | VS 2022 expects managed `.vcxproj` files to have a `ManagedAssembly` element. Fixes: #22583
* | Merge topic 'update-kwsys' into release-3.21Brad King2021-09-091-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6500
| * | KWSys: SystemTools: Ensure Windows Vista APIs are available before using themulatekh2021-09-031-0/+4
| | | | | | | | | | | | | | | | | | Backport KWSys commit `4ef5b1063` (SystemTools: Ensure Windows Vista APIs are available before using them, 2021-08-30) to the CMake 3.21 release branch.
* | | Merge topic 'ci-msvc-19.29-16.11' into release-3.21Brad King2021-09-091-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6501
| * | | gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolsetBrad King2021-09-021-4/+4
| |/ /
* | | Merge topic 'FindPyhton-homebew-on-Mac-M1' into release-3.21Marc Chevrier2021-09-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2636ad5045 FindPython: Ensure homebrew on Mac M1 is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6499
| * | | FindPython: Ensure homebrew on Mac M1 is usedMarc Chevrier2021-09-031-0/+1
| |/ / | | | | | | | | | Fixes: #22581
* | | Merge topic 'vs2022' into release-3.21Brad King2021-09-032-3/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6497
| * | | IRSL: Add discovery of VS 2022 v143 toolset redistributablesBrad King2021-09-021-2/+6
| | | | | | | | | | | | | | | | Fixes: #22586
| * | | MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolsetBrad King2021-09-021-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | This was forgotten in commit 0c7f918fb1 (VS: Update Visual Studio 17 2022 generator for Preview 2, 2021-07-14, v3.21.1~29^2) when the toolset was first renumbered to `v143`. Fixes: #22585
* | | Merge topic 'FindBoost-1.77' into release-3.21Brad King2021-09-031-3/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1ad0c5ae53 FindBoost: Add support for Boost 1.77 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6494
| * | | FindBoost: Add support for Boost 1.77Brad King2021-09-021-3/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_77_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.77.0 source tree. The dependencies differ from those of 1.76: the `contract`, `thread`, and `wave` components no longer depend on `date_time`. The `math` component no longer depends on `atomic`. Fixes: #22588
* | | Merge topic 'ninja-armclang-windows' into release-3.21Brad King2021-09-031-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | b6cf93472f Ninja: fix ARMClang paths for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6484
| * | Ninja: fix ARMClang paths for WindowsMartin Kojtal2021-09-021-0/+2
|/ / | | | | | | | | | | | | We need to escape paths for ARMClang on Windows, see the referenced issue for more details. Fixes: #21093
* | CMake 3.21.2v3.21.2Brad King2021-08-251-1/+1
| |
* | Merge topic 'vs2022' into release-3.21Brad King2021-08-252-3/+6
|\ \ | | | | | | | | | | | | | | | | | | c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6480
| * | VS: Update Visual Studio 17 2022 generator for Preview 3.1Brad King2021-08-252-3/+6
|/ / | | | | | | Issue: #22339
* | Merge branch 'release-3.20' into release-3.21Brad King2021-08-250-0/+0
|\ \ | |/
| * Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20Brad King2021-08-241-1/+1
| |\ | | | | | | | | | Merge-request: !6474
* | \ Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21Brad King2021-08-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6474
| * | GNUInstallDirs: avoid unwanted variable dereferenceBen Boeckel2021-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations, it seems that the variable `0` is defined. In the case found, it was set to `1`. This makes the detection of the missing third argument bogus and unnecessarily triggers a warning. This oversight was introduced in 229b5ee994 (GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir, 2020-10-31) prior to CMake 3.20's release cycle.
* | | Merge topic 'vs-toolset-version' into release-3.21Brad King2021-08-241-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6469
| * | | VS: Add special case for '-T version=14.29.16.11' under VS 16.11Brad King2021-08-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1) and updated by commit a60141feaa (VS: Add special case for '-T version=14.29.16.10' under VS 16.10, 2021-05-27, v3.20.4~11^2). Add a special case for the name VS 17 will use for VS 16.11's default toolset, so that it can be used with VS 16.11 too. Issue: #21922
* | | | Merge topic 'revert-autouic-header-depends' into release-3.21Brad King2021-08-2415-142/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files" Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6465