Commit Graph

61133 Commits

Author SHA1 Message Date
Brad King
35ca2d524b Merge topic 'msvc-embed-manifest-direct'
0b552eb877 MSVC: Embed manifests directly for non-incremental vs_link_exe links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8245
2023-02-24 08:40:07 -05:00
Brad King
d6831f99fa Merge topic 'FetchContent-generator-instance'
9af0e67ee5 FetchContent: Relay CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8195
2023-02-24 08:36:25 -05:00
Brad King
88b75204e5 Merge topic 'PATH-genex-handle-list-of-paths'
e395310a21 PATH-genex: handle lists for path decomposition and transformations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8238
2023-02-24 08:35:19 -05:00
Brad King
1d939b43b2 Merge topic 'tutorial_dependency_inversion'
8ddf32196c Tutorial: Refactor MathFunctions code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7789
2023-02-24 08:34:24 -05:00
Brad King
7552276e6e Merge topic 'GenerateExportHeader-Fix-Clang-support-on-Windows'
1e19936320 GenerateExportHeader: Fix Clang support on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Adrien De Coninck <deconinck.adrien@gmail.com>
Merge-request: !8221
2023-02-24 08:33:23 -05:00
Brad King
d19b61bf43 Merge topic 'find_package-PACKAGENAME_ROOT'
df9c4b1872 find_package: Use <PACKAGENAME>_ROOT variables as search prefixes
4da27a73bd Help: Document <PackageName>_ROOT variable ordering using an ordered list
bfeb16bd5b cmFindPackageCommand: Refactor CMP0074 logic to de-duplicate lookups
c0fcd07e6f cmFindPackageCommand: Factor out methods for package root stack management
acd9636d9d cmSystemTools: Add helpers for reading and parsing PATH env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8240
2023-02-24 08:31:28 -05:00
Brad King
0eb6c31551 Merge branch 'release-3.26' 2023-02-24 08:29:53 -05:00
Brad King
2ce23aec9c Merge topic 'find-openssl-find-pthread'
24c7279a6f FindOpenSSL: Search for -pthread flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8246
2023-02-24 08:29:53 -05:00
Brad King
030c70f92a Merge topic 'find-openssl-find-pthread' into release-3.26
24c7279a6f FindOpenSSL: Search for -pthread flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8246
2023-02-24 08:29:52 -05:00
Kitware Robot
92fb3ba39f CMake Nightly Date Stamp 2023-02-24 00:01:14 -05:00
Máté Ferenc Nagy-Egri
9af0e67ee5 FetchContent: Relay CMAKE_GENERATOR_INSTANCE
If set, relay `CMAKE_GENERATOR_INSTANCE`.  It may affect compiler
detection in the subbuild folder.

Fixes: #24404
2023-02-23 17:07:50 -05:00
Brad King
3f41c0a12a Merge topic 'gitlab-issue-template'
e408157e1b gitlab: Add default issue template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !8244
2023-02-23 16:34:53 -05:00
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
Kyle Edwards
24c7279a6f FindOpenSSL: Search for -pthread flag
Because -pthread doesn't begin with -l, it doesn't show up in the
pkgconfig LIBRARIES variable, causing FindOpenSSL to not add the
Threads::Threads dependency. Explicitly search LDFLAGS_EXTRA
for -pthread and add the dependency if it's found.

Fixes: #24532
2023-02-23 13:31:23 -05:00
Markus Ferrell
8ddf32196c Tutorial: Refactor MathFunctions code
Propagate the refactor in Step 10 MathFunctions through all of the
steps. Use MathFunctions/MathFunctions.cxx instead of Tutorial.cxx
to determine which sqrt library is called. Adds .h files which
correspond to their .cxx files by name.
2023-02-23 09:42:10 -05:00
Brad King
df9c4b1872 find_package: Use <PACKAGENAME>_ROOT variables as search prefixes
Extend commit eb35d8884b (find_package: Use PackageName_ROOT variables
as search prefixes, 2018-03-15, v3.12.0-rc1~349^2) to also check
upper-case `<PACKAGENAME>_ROOT` variables.  Add policy `CMP0144` to
enable the behavior in a compatible way.

Fixes: #24403
2023-02-23 09:15:14 -05:00
Brad King
4da27a73bd Help: Document <PackageName>_ROOT variable ordering using an ordered list
Make room to add more steps in a documented order.
2023-02-23 09:12:29 -05:00
Brad King
bfeb16bd5b cmFindPackageCommand: Refactor CMP0074 logic to de-duplicate lookups 2023-02-23 09:12:29 -05:00
Brad King
c0fcd07e6f cmFindPackageCommand: Factor out methods for package root stack management 2023-02-23 09:12:28 -05:00
Brad King
acd9636d9d cmSystemTools: Add helpers for reading and parsing PATH env vars 2023-02-23 09:05:59 -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
Corentin Damman
1e19936320 GenerateExportHeader: Fix Clang support on Windows
When using Clang with Visual Studio, the GenerateExportHeader function
generates the DEPRECATED definition "__attribute__ ((__deprecated__))",
because Clang can compile such instruction. However, if a user wants to compile
the library with this generated header with MSVC, the declaration is not valid.

We suggest to always use the DEPRECATED definition "__declspec(deprecated)" on
Windows, which is valid for both Clang and MSVC.
2023-02-23 09:19:06 +01:00
Kitware Robot
bc75361790 CMake Nightly Date Stamp 2023-02-23 00:01:13 -05:00
Brad King
e408157e1b gitlab: Add default issue template
Populate issue descriptions by default with a note directing reporters
to other resources they should consider using first.  Make it a comment
so that the content does not actually render in the report not removed.
2023-02-22 16:44:39 -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
Marc Chevrier
e395310a21 PATH-genex: handle lists for path decomposition and transformations
Fixes: #24371
2023-02-21 19:34:43 +01: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