mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 04:09:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
61,111 Commits 2 Branches 401 Tags
0b552eb877b887638e8130bb6c982106a76827d8
Commit Graph

61111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Ng 0b552eb877 MSVC: Embed manifests directly for non-incremental vs_link_exe links 
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
 2023-02-23 14:35:08 -05:00
Brad King df5adfd5ab Merge branch 'release-3.26' 2023-02-23 09:01:20 -05:00
Brad King 68298bdfc5 Merge topic 'ci-msvc-14.35' 
9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8242
 2023-02-23 09:01:20 -05:00
Brad King b8ee18759b Merge topic 'ci-msvc-14.35' into release-3.26 
9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8242
 2023-02-23 09:01:19 -05:00
Kitware Robot bc75361790 CMake Nightly Date Stamp 2023-02-23 00:01:13 -05:00
Brad King 9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset 2023-02-22 12:35:46 -05:00
Brad King 86db720a8c Merge branch 'release-3.26' 2023-02-22 11:03:30 -05:00
Brad King 67a1e2a5d1 CMake 3.26.0-rc4 v3.26.0-rc4 2023-02-22 10:06:26 -05:00
Brad King 13d0c2d636 Merge topic 'iar-lang-vars' 
3b365c461f IAR: Tolerate variables named for languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8235
 2023-02-22 08:43:21 -05:00
Brad King d3592e2a4b Merge topic 'fix_parallel_hdf5' 
18c2970a97 FindHDF5: Fix detection of Parallel HDF5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8234
 2023-02-22 08:40:22 -05:00
Brad King 6eb290dcd0 Merge topic 'update-curl' 
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
 2023-02-22 08:39:09 -05:00
Brad King 9410f46ea2 Merge topic 'ci-macos-universal' 
557c3934ee gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8237
 2023-02-22 07:39:44 -05:00
Kitware Robot e0be05d9f1 CMake Nightly Date Stamp 2023-02-22 00:01:10 -05:00
Weiqun Zhang 18c2970a97 FindHDF5: Fix detection of Parallel HDF5 
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".
 2023-02-21 12:29:28 -08:00
Brad King 557c3934ee gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64 2023-02-21 12:25:47 -05:00
Brad King d7e206fd58 Utilities: Update hard-coded try_compile results for curl 7.88.1 2023-02-21 10:25:01 -05:00
Brad King ce1550f178 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2023-02-20 (046209e5)
 2023-02-21 10:04:36 -05:00
Curl Upstream 11ba4361aa curl 2023-02-20 (046209e5) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 046209e561b7e9b5aab1aef7daebf29ee6e6e8c7 (curl-7_88_1).
 2023-02-21 09:54:46 -05:00
Brad King 37cceabc65 curl: Update script to get curl 7.88.1 2023-02-21 09:54:32 -05:00
Joakim Lönnberg 3b365c461f IAR: Tolerate variables named for languages 
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).
 2023-02-21 09:24:14 -05:00
Brad King d3ea15e801 Merge topic 'qt-sizetype' 
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
 2023-02-21 08:54:15 -05:00
Brad King a2c77755ab Merge topic 'unlimited-version-compare' 
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
 2023-02-21 08:52:46 -05:00
Brad King ebf0088efc Merge topic 'GetPrerequisites-linux-x86' 
cf2ad9995a GetPrerequisites: Ignore relative paths printed by ldd

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8229
 2023-02-21 08:50:59 -05:00
Brad King d25b7ba192 Merge topic 'doco' 
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
 2023-02-21 08:50:07 -05:00
Brad King ad8ada1bee Merge topic 'KateNinjaImprovements' 
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
 2023-02-21 08:47:00 -05:00
Brad King c2897eb725 Merge topic 'add_lang_expressions_ghs' 
780b279cc6 GHS: Enable language-dependent generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8224
 2023-02-21 08:45:08 -05:00
Brad King 286dd53d6c Merge topic 'FindEXPAT-multi-config' 
13079f382b FindEXPAT: Fix for debug and other modified builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8225
 2023-02-21 08:41:14 -05:00
Brad King 4abf24e959 Merge branch 'release-3.26' 2023-02-21 08:39:01 -05:00
Brad King 8d5314eff8 Merge topic 'BundleUtilities-chmod-later' 
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
 2023-02-21 08:39:00 -05:00
Brad King 70ecc3c36a Merge topic 'BundleUtilities-chmod-later' into release-3.26 
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
 2023-02-21 08:38:59 -05:00
Brad King 7fabfd9e08 Merge branch 'release-3.26' 2023-02-21 08:37:50 -05:00
Brad King c4218a7fd1 Merge topic 'FindOpenSSL-threads' 
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
 2023-02-21 08:37:50 -05:00
Brad King 03ebceb1a3 Merge topic 'FindOpenSSL-threads' into release-3.26 
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
 2023-02-21 08:37:49 -05:00
Kitware Robot 053fa2fef8 CMake Nightly Date Stamp 2023-02-21 00:01:10 -05:00
Brad King 5cda8a3993 cmake-gui: Fix conversion warnings about Qt indexing types 
Qt 5 uses `int` for indexing, and Qt 6 uses `qsizetype`.  Add helper
types and casts to the appropriate type to avoid conversion warnings.
 2023-02-20 17:55:49 -05:00
Brad King 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item 
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
 2023-02-20 13:17:04 -05:00
David Gobbi aa86e8ddfd Remove component size limit for version comparisons 
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.
 2023-02-20 12:54:43 -05:00
David Gobbi 7e730d8f7f Tests: Add cases for cmSystemTools::VersionCompare 2023-02-20 12:54:04 -05:00
Brad King a8cedb1572 FindOpenSSL: Fix regression in dependency on threads 
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
 2023-02-20 10:53:42 -05:00
Đoàn Trần Công Danh cf2ad9995a GetPrerequisites: Ignore relative paths printed by ldd 
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.
 2023-02-20 09:30:40 -05:00
Alexander Neundorf 2b713b0f95 Kate: mention Ninja Multiconfig in the docs 2023-02-20 09:08:56 -05:00
tobil4sk 13079f382b FindEXPAT: Fix for debug and other modified builds 
Now considers debug builds, and various other build types which result
in a modified library name by the upstream build system.

Fixes: #24422
 2023-02-20 08:48:09 -05:00
Brad King d18806e673 Merge topic 'ninja-custom-command-depends' 
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
 2023-02-20 08:34:34 -05:00
Brad King 20cb716e4f Merge branch 'release-3.26' 2023-02-20 08:32:12 -05:00
Brad King 4e39c25fce Merge topic 'xcode-revert-header-map' 
841272eb35 Xcode: Restore suppression of header maps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8218
 2023-02-20 08:32:11 -05:00
Brad King 3b3f2e920b Merge topic 'xcode-revert-header-map' into release-3.26 
841272eb35 Xcode: Restore suppression of header maps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8218
 2023-02-20 08:32:10 -05:00
Brad King 28f5af4ec5 Merge branch 'release-3.26' 2023-02-20 08:30:39 -05:00
Brad King d5cba69f78 Merge topic 'cxx-module-mapper-clang' 
195ee13710 cmCxxModuleMapper: Specify clang's BMI dependency with new form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8219
 2023-02-20 08:30:39 -05:00
Brad King 1faf907f84 Merge topic 'cxx-module-mapper-clang' into release-3.26 
195ee13710 cmCxxModuleMapper: Specify clang's BMI dependency with new form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8219
 2023-02-20 08:30:38 -05:00
Kitware Robot 9fc1ce97a8 CMake Nightly Date Stamp 2023-02-20 00:01:44 -05:00