Commit Graph

61095 Commits

Author SHA1 Message Date
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
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
Kitware Robot
9b07b57c01 CMake Nightly Date Stamp 2023-02-19 00:01:13 -05:00
scivision
6f354a6d57 Help: ctest(1): emphasize the --test-dir option
it seems few people know of this option
and needlessly add extra shell commands to change directory.
2023-02-18 20:22:23 -05:00
scivision
f0e60ea867 Help: cmake (1): put modern configure signature first
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.
2023-02-18 20:13:40 -05:00
Alexander Neundorf
f6f8f89e6c Kate: support for the targets of multi config ninja
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.
2023-02-18 23:23:11 +01:00
Alexander Neundorf
0429a37e48 Kate: enable the ninja multiconfig generator for kate
Kate can work as well with the multi-config version of ninja.
Additionally, add the "/fast" targets only for make, not for ninja.
2023-02-18 21:57:39 +01:00
Kitware Robot
8b1160b509 CMake Nightly Date Stamp 2023-02-18 00:01:16 -05:00
Neal Venditto
780b279cc6 GHS: Enable language-dependent generator expressions
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
2023-02-17 19:07:37 -05:00
Brad King
841272eb35 Xcode: Restore suppression of header maps
In commit 8527f42b96 (Xcode: Explicitly disable deprecated user include
path feature, 2023-01-31, v3.26.0-rc1~7^2) we dropped the Xcode build
setting `USE_HEADERMAP = NO` because Xcode 14's "Build Documentation"
feature (`xcodebuild RUN_DOCUMENTATION_COMPILER=YES`) fails in some
cases without header maps.  However, enabling header maps causes Xcode
to add `-iquote .../foo.hmap` and `-I .../bar.hmap` flags that can
change the intended header file search order based on the contents of
the header maps.  This can break existing projects.  Restore the
`USE_HEADERMAP = NO` setting to fix the header file search order.

Further investigation will be needed to resolve the problematic cases
with the Xcode 14 "Build Documentation" feature.  Meanwhile projects
encountering such cases can set the `XCODE_ATTRIBUTE_USE_HEADERMAP`
target property to `YES` themselves.

Fixes: #24418
Issue: #24379
2023-02-17 18:02:45 -05:00
Brad King
4f45993a5c Merge branch 'release-3.26' 2023-02-17 14:00:28 -05:00
Brad King
0845a0f30d Merge branch 'release-3.25' 2023-02-17 14:00:24 -05:00
Brad King
d08b1e68fe Merge branch 'release-3.25' into release-3.26 2023-02-17 14:00:12 -05:00
Brad King
e2f1d6e7bd Merge topic 'backport-3.25-curl-noproxy-fix' into release-3.25
ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release

Merge-request: !8223
2023-02-17 13:58:45 -05:00
Brad King
ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release
CMake 3.25 updated to curl 7.86, which had some `no_proxy` regressions.
Backport upstream curl fixes:

* commit `b830f9ba9` (noproxy: fix tail-matching)
* commit `b1953c193` (noproxy: tailmatch like in 7.85.0 and earlier)
* commit `60453483b` (noproxy: guard against empty hostnames)

CMake 3.26 already updated to curl 7.87, and has the fixes.

Fixes: #24426
2023-02-17 13:51:03 -05:00
Chuanqi Xu
195ee13710 cmCxxModuleMapper: Specify clang's BMI dependency with new form 2023-02-17 12:27:37 -05:00
Abdelmaged Khalifa
ea2a05f402 Add variable CMAKE_ADD_CUSTOM_COMMAND_DEPENDS_EXPLICIT_ONLY
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
2023-02-17 17:12:12 +02:00
Brad King
f7be10b26a Merge topic 'ci-linkcheck'
0787148785 gitlab-ci: Report sphinx logs as artifacts of its lint job
14506f49a2 Utilities/Sphinx: Configure linkcheck allowed permanent redirects
3c5b34af9d Help: Replace links with their permanent redirects
1004be159f FindCUDAToolkit: Replace broken links to NVIDIA documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8210
2023-02-17 08:54:51 -05:00