summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MSVC: Embed manifests directly for non-incremental vs_link_exe linksAndrew Ng2023-02-233-21/+36
| | | | | | | | | | | | | | This avoids the need to separately execute `mt.exe` to perform the embedding of manifests into the output for non-incremental links. The primary motivation for this change is that this separate execution of `mt.exe` to embed manifests is known to cause intermittent failures due to AV/security scanning. The only change in behavior is that any linker generated manifest will no longer be output as a separate manifest file alongside the output file. Fixes: #24531
* Merge branch 'release-3.26'Brad King2023-02-230-0/+0
|\
| * Merge topic 'ci-msvc-14.35' into release-3.26Brad King2023-02-231-11/+11
| |\ | | | | | | | | | | | | | | | | | | 9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8242
* | \ Merge topic 'ci-msvc-14.35'Brad King2023-02-231-11/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8242
| * | gitlab-ci: Update Windows builds to MSVC 14.35 toolsetBrad King2023-02-221-11/+11
| |/
* | CMake Nightly Date StampKitware Robot2023-02-231-1/+1
| |
* | Merge branch 'release-3.26'Brad King2023-02-220-0/+0
|\ \ | |/
| * CMake 3.26.0-rc4v3.26.0-rc4Brad King2023-02-221-1/+1
| |
* | Merge topic 'iar-lang-vars'Brad King2023-02-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 3b365c461f IAR: Tolerate variables named for languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8235
| * | IAR: Tolerate variables named for languagesJoakim Lönnberg2023-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project or user sets a variable or cache entry named `C` or `CXX`, we were previously comparing those language names to the value of that variable, rather than the name itself. Double-quote the string to take advantage of policy `CMP0054`, but also add "x" prefixes to support projects that do not set the policy. This extends a similar fix from commit c8eb357738 (CompilerId: Tolerate variables named for languages, 2021-06-17, v3.21.0-rc1~9^2).
* | | Merge topic 'fix_parallel_hdf5'Brad King2023-02-221-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18c2970a97 FindHDF5: Fix detection of Parallel HDF5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8234
| * | | FindHDF5: Fix detection of Parallel HDF5Weiqun Zhang2023-02-211-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To detect Parallel HDF5, the output of `h5pcc -showconfig` was compared with `Parallel HDF5: yes`. However, the Boolean flag is not always `yes` or `no`, because it was set by the value in `HDF5_ENABLE_PARALLEL` if CMake was used for the configuration. This commit instead checks to see if the value is interpreted by CMake as "true".
* | | | Merge topic 'update-curl'Brad King2023-02-22362-9803/+14333
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7e206fd58 Utilities: Update hard-coded try_compile results for curl 7.88.1 ce1550f178 Merge branch 'upstream-curl' into update-curl 11ba4361aa curl 2023-02-20 (046209e5) 37cceabc65 curl: Update script to get curl 7.88.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8236
| * | | | Utilities: Update hard-coded try_compile results for curl 7.88.1Brad King2023-02-211-0/+1
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2023-02-21360-9802/+14331
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2023-02-20 (046209e5)
| | * | | | curl 2023-02-20 (046209e5)Curl Upstream2023-02-21360-9815/+14392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 046209e561b7e9b5aab1aef7daebf29ee6e6e8c7 (curl-7_88_1).
| * | | | | curl: Update script to get curl 7.88.1Brad King2023-02-211-1/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'ci-macos-universal'Brad King2023-02-226-0/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557c3934ee gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8237
| * | | | | gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64Brad King2023-02-216-0/+49
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2023-02-221-1/+1
|/ / / /
* | | | Merge topic 'qt-sizetype'Brad King2023-02-218-20/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cda8a3993 cmake-gui: Fix conversion warnings about Qt indexing types Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8233
| * | | | cmake-gui: Fix conversion warnings about Qt indexing typesBrad King2023-02-208-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Qt 5 uses `int` for indexing, and Qt 6 uses `qsizetype`. Add helper types and casts to the appropriate type to avoid conversion warnings.
* | | | | Merge topic 'unlimited-version-compare'Brad King2023-02-212-7/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa86e8ddfd Remove component size limit for version comparisons 7e730d8f7f Tests: Add cases for cmSystemTools::VersionCompare Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8231
| * | | | | Remove component size limit for version comparisonsDavid Gobbi2023-02-202-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VersionCompare() function converted version components to 'unsigned long' prior to comparing them. Any version components too large for 'unsigned long' were treated as equal to ULONG_MAX. This impacted operators like VERSION_GREATER, VERSION_LESS, and VERSION_EQUAL. The new code does not limit the length of the version components for valid comparisons.
| * | | | | Tests: Add cases for cmSystemTools::VersionCompareDavid Gobbi2023-02-201-0/+29
| |/ / / /
* | | | | Merge topic 'GetPrerequisites-linux-x86'Brad King2023-02-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf2ad9995a GetPrerequisites: Ignore relative paths printed by ldd Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8229
| * | | | | GetPrerequisites: Ignore relative paths printed by lddĐoàn Trần Công Danh2023-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On x86 Linux, the ldd output for its vDSO (linux-gate.so.1) is a bit different from other Linux with standard vDSO name (linux-vdso.so.1). $ ldd /bin/ls linux-gate.so.1 => linux-gate.so.1 (0xf7f5e000) libcap.so.2 => /usr/lib32/libcap.so.2 (0xf7f22000) libc.so.6 => /usr/lib32/libc.so.6 (0xf7cfb000) /lib/ld-linux.so.2 => /usr/lib32/ld-linux.so.2 (0xf7f60000) This fixes the `Tests/BundleUtilities` test on x86 Linux.
* | | | | | Merge topic 'doco'Brad King2023-02-214-21/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f354a6d57 Help: ctest(1): emphasize the --test-dir option f0e60ea867 Help: cmake (1): put modern configure signature first Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8222
| * | | | | | Help: ctest(1): emphasize the --test-dir optionscivision2023-02-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it seems few people know of this option and needlessly add extra shell commands to change directory.
| * | | | | | Help: cmake (1): put modern configure signature firstscivision2023-02-193-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recommend compact, most robust signature first. So many people are still using the multi-step pre-3.13 way of initializing a build. Rather than simply cmake -Bbuild which is one step instead of 3 just to configure a new project.
* | | | | | | Merge topic 'KateNinjaImprovements'Brad King2023-02-213-27/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b713b0f95 Kate: mention Ninja Multiconfig in the docs f6f8f89e6c Kate: support for the targets of multi config ninja 0429a37e48 Kate: enable the ninja multiconfig generator for kate Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8226
| * | | | | | | Kate: mention Ninja Multiconfig in the docsAlexander Neundorf2023-02-202-0/+4
| | | | | | | |
| * | | | | | | Kate: support for the targets of multi config ninjaAlexander Neundorf2023-02-182-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, cmake now generates the targets once for each config into the kate project file, so users can build the targets for all configs with this generator.
| * | | | | | | Kate: enable the ninja multiconfig generator for kateAlexander Neundorf2023-02-181-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kate can work as well with the multi-config version of ninja. Additionally, add the "/fast" targets only for make, not for ninja.
* | | | | | | | Merge topic 'add_lang_expressions_ghs'Brad King2023-02-211-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 780b279cc6 GHS: Enable language-dependent generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8224
| * | | | | | | | GHS: Enable language-dependent generator expressionsNeal Venditto2023-02-181-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Green Hills MULTI` to the list of generators checked for the `COMPILE_LANGUAGE`, `COMPILE_LANG_AND_ID`, `LINK_LANGUAGE`, and `LINK_LANG_AND_ID` generator expressions, since these are supported by the generator. Fixes: #24262
* | | | | | | | | Merge topic 'FindEXPAT-multi-config'Brad King2023-02-211-22/+78
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13079f382b FindEXPAT: Fix for debug and other modified builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8225
| * | | | | | | | | FindEXPAT: Fix for debug and other modified buildstobil4sk2023-02-201-22/+78
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now considers debug builds, and various other build types which result in a modified library name by the upstream build system. Fixes: #24422
* | | | | | | | | Merge branch 'release-3.26'Brad King2023-02-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge topic 'BundleUtilities-chmod-later' into release-3.26Brad King2023-02-211-4/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8232
* | \ \ \ \ \ \ \ \ Merge topic 'BundleUtilities-chmod-later'Brad King2023-02-211-4/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8232
| * | | | | | | | | BundleUtilities: Avoid unnecessary chmod in fixup_bundle_itemBrad King2023-02-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the permissions modification added by commit 88fed668b1 (Make bundle items writable before fixup, 2010-09-07, v2.8.3~129^2) inside the condition added by commit 45ed314bff (BundleUtilities: do not run install_name_tool on scripts, 2020-07-27, v3.19.0-rc1~404^2). There is no reason to add write permissions to a file that we are not going to modify. Fixes: #24424
* | | | | | | | | | Merge branch 'release-3.26'Brad King2023-02-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindOpenSSL-threads' into release-3.26Brad King2023-02-211-6/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8cedb1572 FindOpenSSL: Fix regression in dependency on threads Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bret Brown <mail@bretbrownjr.com> Acked-by: Matias Lopez <imatlopez@gmail.com> Merge-request: !8230
* | | | | | | | | | Merge topic 'FindOpenSSL-threads'Brad King2023-02-211-6/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8cedb1572 FindOpenSSL: Fix regression in dependency on threads Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bret Brown <mail@bretbrownjr.com> Acked-by: Matias Lopez <imatlopez@gmail.com> Merge-request: !8230
| * | | | | | | | FindOpenSSL: Fix regression in dependency on threadsBrad King2023-02-201-6/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1b7804edd0 (FindOpenSSL: use extra dependencies from pkg-config as well, 2022-12-05, v3.26.0-rc1~227^2) we conditionally find Threads but unconditionally depend on it. Make the conditions consistent. Fixes: #24505
* | | | | | | | CMake Nightly Date StampKitware Robot2023-02-211-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'ninja-custom-command-depends'Brad King2023-02-208-11/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea2a05f402 Add variable CMAKE_ADD_CUSTOM_COMMAND_DEPENDS_EXPLICIT_ONLY Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8220
| * | | | | | | Add variable CMAKE_ADD_CUSTOM_COMMAND_DEPENDS_EXPLICIT_ONLYAbdelmaged Khalifa2023-02-178-11/+71
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CMake variable `CMAKE_ADD_CUSTOM_COMMAND_DEPENDS_EXPLICIT_ONLY` to enable option `DEPENDS_EXPLICIT_ONLY` on all uses of `add_custom_command`. Fixes: #17097
* | | | | | | Merge branch 'release-3.26'Brad King2023-02-200-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |