summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | AUTOUIC: Revert "Fix generating of dependency rules for UI header files"Brad King2021-08-1915-142/+82
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit e5ec0e52f4 (AUTOUIC: Fix generating of dependency rules for UI header files, 2021-07-22, v3.21.1~8^2) because it caused regressions. For example, changing one C++ source can now cause many others to rebuild. Revert the change pending further investigation. Fixes: #22531 Issue: #16776
* | | | Merge topic 'FindMPI-framework-not-a-compile-flag' into release-3.21Brad King2021-08-241-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com> Merge-request: !6467
| * | | FindMPI: do not detect `-framework` as a compile flagBen Boeckel2021-08-191-1/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPICH 3.4.2 now reports `-framework OpenCL` as one of its compilation flag. The compile flag extraction is seeing it as a generic `-f` flag and misses its argument. This ends up with a compile option of `-framework` which eats the next flag (and may be very important). It does not seem that passing `-framework` as a link flag is necessary at this time, so that is being actively ignored for now. Fixes: #22555
* | | Merge topic 'FindPkgConfig-restore-legacy-behavior' into release-3.21Brad King2021-08-193-0/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6461
| * | | FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEWMarc Chevrier2021-08-183-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | Module behavior must be independent from `CMP0126` policy. Fixes: #22526
* | | | Merge topic 'binutils-clang-fallback-ld' into release-3.21Brad King2021-08-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 788b7afff2 FindBinUtils: Fall back to ld for Clang without lld Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6457
| * | | | FindBinUtils: Fall back to ld for Clang without lldThomas Bernard2021-08-181-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | If `lld` is not available, Clang can still use `ld`. Fixes: #22500
* | | | Merge topic 'CheckLanguage-CMP0126' into release-3.21Brad King2021-08-191-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89ed11ae6f CheckLanguage: Avoid CMP0126 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6462
| * | | | CheckLanguage: Avoid CMP0126 warningBrad King2021-08-181-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro's implementation converts a normal variable into a cache variable intentionally, so both are set. Explicitly set CMP0126 to NEW to avoid a warning in trace mode. This won't affect the module behavior because the code path does not activate if a normal variable is already defined anyway. Fixes: #22548
* | | | Merge topic 'android-macos-arm64' into release-3.21Brad King2021-08-191-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 164643fc39 Android: Fix NDK toolchain dir on arm64 mac Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6449
| * | | Android: Fix NDK toolchain dir on arm64 macWangBin2021-08-181-1/+1
|/ / /
* | | Merge topic 'vs-flags' into release-3.21Brad King2021-08-112-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3f9ef3703a VS: Fix /reference and /headerUnit flag table entries for v142 and v143 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6445
| * | | VS: Fix /reference and /headerUnit flag table entries for v142 and v143Brad King2021-08-102-4/+4
|/ / / | | | | | | | | | | | | | | | | | | These flags accept values in following arguments, not immediately appended. Fixes: #22530
* | | Merge topic 'binutils-no-cmake-paths' into release-3.21Brad King2021-08-103-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fc1f733cc7 BinUtils: Avoid searching CMAKE_PREFIX_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6434
| * | | 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 'help_cmake_path' into release-3.21Brad King2021-08-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb19af546b Help: cmake_path: add missing parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6431
| * | | | Help: cmake_path: add missing parameterMichael Hirsch2021-08-061-2/+2
| |/ / / | | | | | | | | | | | | for cmake_path(`CONVERT` ... [NORMALIZE]) was missing in top summary
* | | | Merge topic 'nvhpc_support_new_c_and_c++_standards' into release-3.21Brad King2021-08-092-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac426e460 NVHPC-C: Add support for C17 f5dbc27c27 NVHPC-CXX: Add support for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6430
| * | | NVHPC-C: Add support for C17Robert Maynard2021-08-051-0/+5
| | | |
| * | | NVHPC-CXX: Add support for C++20Robert Maynard2021-08-051-0/+5
| | | |
* | | | 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
generated by cgit v0.12 at 2025-02-09 09:17:37 (GMT)