Commit Graph

56358 Commits

Author SHA1 Message Date
Craig Scott 95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template 2022-03-21 14:31:09 +11:00
Craig Scott 28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage
There's no benefit to storing the CPACK_PRODUCTBUILD_DOMAINS
prefix in a variable and appending to it in the C++ code. It has the
disadvantage of making it harder to find usages of the variables with
a suffix appended to that string. Expand out the strings at the places
they are used so that they are easier to spot.
2022-03-21 13:36:48 +11:00
Brad King 66ba460810 CMake 3.23.0-rc4 v3.23.0-rc4 2022-03-18 08:26:30 -04:00
Brad King b91d9f8397 Merge topic 'doc-multiple-src-paths' into release-3.23
1b8669c1d6 Help: Document warning about multiple source paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7082
2022-03-18 08:21:39 -04:00
Brad King 8efc92d80f Merge topic 'r2022a' into release-3.23
6032213456 FindMatlab: Add R2022a => 9.12 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7086
2022-03-18 08:20:58 -04:00
Brad King 1b8669c1d6 Help: Document warning about multiple source paths
Although passing multiple source paths was never documented, it was not
diagnosed by CMake 3.22 and below.  In CMake 3.23 we now diagnose extra
paths and warn.  Document this change and add a release note.

Issue: #23334
2022-03-18 07:39:22 -04:00
Michael Hirsch 6032213456 FindMatlab: Add R2022a => 9.12 version 2022-03-18 07:22:42 -04:00
Brad King 6ac27468b4 Merge branch 'release-3.22' into release-3.23 2022-03-18 07:19:23 -04:00
Brad King 528a426c8e Merge topic 'FindPython-pypy-specify-versions' into release-3.23
2834cea155 FindPython: fix various problems using pypy interpreters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7081
2022-03-18 07:18:04 -04:00
Brad King b782d9e124 Merge topic 'always_prefer_last_source_dir' into release-3.23
b44ad7992a cmake: Always prefer the last source directory provided

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7084
2022-03-18 07:16:23 -04:00
Robert Maynard b44ad7992a cmake: Always prefer the last source directory provided
Fixes: #23334
2022-03-17 15:23:01 -04:00
Brad King 736964d94f Merge topic 'FindPostgreSQL-doc-versions' into release-3.23
fcc0119af0 FindPostgreSQL: Update known versions in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7080
2022-03-17 11:03:59 -04:00
Brad King ae7294e515 Merge topic 'doc-src-bld-selection' into release-3.23
fea270d3ed Help: Document cmake source and binary dir selection rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7076
2022-03-17 11:03:11 -04:00
Brad King c41978274e Merge branch 'FindPython-pypy-specify-versions' into release-3.22
Merge-request: !7081
2022-03-17 10:15:09 -04:00
Marc Chevrier 2834cea155 FindPython: fix various problems using pypy interpreters
* add more possible directories for include file search
* enhance version detection from library and include files
* search for file pypy_decl.h when PyPy.h is not defined
2022-03-17 14:53:40 +01:00
Kai Pastor fcc0119af0 FindPostgreSQL: Update known versions in documentation 2022-03-17 09:41:57 -04:00
Robert Maynard fea270d3ed Help: Document cmake source and binary dir selection rules
Co-authored-by: Brad King <brad.king@kitware.com>
2022-03-17 09:38:32 -04:00
Brad King daf9a5cfad Merge topic 'tll-genex-concat' into release-3.23
add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7078
2022-03-17 09:13:46 -04:00
Brad King b2ba662ca6 Merge topic 'doc-list-semicolons' into release-3.23
8abd714176 Help: Clarify that ENVIRONMENT test properties take ;-separated lists
02cf404ace Help: Add advice for dealing with semicolons in lists
c4117d9116 ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7066
2022-03-16 11:14:58 -04:00
Brad King e6ad4cec73 Merge topic 'language-header-file-only-doc' into release-3.23
83a80e5193 Help: Clarify interaction of LANGUAGE and HEADER_FILE_ONLY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7075
2022-03-16 11:13:58 -04:00
Brad King e3c748ce29 Merge branch 'release-3.22' into release-3.23 2022-03-16 11:11:06 -04:00
Brad King 1925a5ccc2 Merge topic 'binutils-llvm-ar-apple' into release-3.23
fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7077
2022-03-16 11:09:44 -04:00
Brad King 4a4fa6ae54 Merge branch 'release-3.21' into release-3.22 2022-03-16 10:51:07 -04:00
Brad King 2db936e59a Merge branch 'binutils-llvm-ar-apple' into release-3.22
Merge-request: !7077
2022-03-16 10:51:03 -04:00
Brad King 12e03d7051 Merge branch 'binutils-llvm-ar-apple' into release-3.21
Merge-request: !7077
2022-03-16 10:50:43 -04:00
Brad King add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies
Since commit c1e812ad4f (target_link_libraries: Improve tolerance of
unquoted generator expressions, 2022-02-15, v3.23.0-rc2~11^2) we
accumulate consecutive non-keyword arguments to recover an unquoted
generator expression as a single entry.  When given multiple consecutive
non-genex library names, the grouping breaks our logic that expects each
entry is either a raw target name or a genex.  Revise the logic to only
accumulate multiple arguments when they end inside a partial genex.

This bug caused `target_link_libraries` to stop wrapping static library
private dependencies in `$<LINK_ONLY:...>` for `INTERFACE_LINK_LIBRARIES`
when multiple consecutive library names are given.  Add a test case
covering that behavior.

Fixes: #23302
2022-03-16 10:47:32 -04:00
Brad King fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms
Since commit 29ea94e17c (BinUtils: Avoid llvm-ar on Apple platforms,
2022-03-03, v3.21.6~1^2) we do not consider `llvm-ar` at all on Apple
platforms.  However, there are existing cross-compiling use cases in
which the toolchain has `llvm-ar` but not `ar`.  Prior to the
re-ordering in commit cf82300a63 (BinUtils: Clarify search logic and
make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2), we preferred
`ar` and then `llvm-ar`.  Restore the original order for Apple.

Fixes: #23320
2022-03-16 10:46:11 -04:00
Brad King 8abd714176 Help: Clarify that ENVIRONMENT test properties take ;-separated lists
Follow up commit 79f64cc773 (Help: ENVIRONMENT_MODIFICATION clarify only
supports singular values, 2022-02-23) to specifically call out the list
format.

Issue: #23315
2022-03-15 15:49:21 -04:00
Brad King 02cf404ace Help: Add advice for dealing with semicolons in lists
Issue: #23315
2022-03-15 15:49:13 -04:00
Kyle Edwards 83a80e5193 Help: Clarify interaction of LANGUAGE and HEADER_FILE_ONLY 2022-03-15 13:06:35 -04:00
Brad King 790c225208 Merge topic 'doc-ignore-prefix-paths' into release-3.23
5cb0a730c9 Help: Clarify behavior of search ignore-related variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7056
2022-03-15 12:48:41 -04:00
Brad King a8bc22b4d6 Merge branch 'release-3.22' into release-3.23 2022-03-15 12:47:24 -04:00
Brad King 941605e427 Merge topic 'AppleClang-cxx20-cxx23-flags' into release-3.23
683e4e9cab AppleClang: Add C++20 and C++23 flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7063
2022-03-15 12:46:32 -04:00
Craig Scott 8e21f244ec Merge topic 'doc-LINK_LIBRARIES_ONLY_TARGETS' into release-3.23
95cdce829f Help: Fix typo and improve readability for LINK_LIBRARIES_ONLY_TARGETS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7068
2022-03-14 07:55:09 -04:00
Craig Scott 95cdce829f Help: Fix typo and improve readability for LINK_LIBRARIES_ONLY_TARGETS 2022-03-13 20:31:08 +11:00
Craig Scott 5cb0a730c9 Help: Clarify behavior of search ignore-related variables
Not all the behaviors of CMake variables for ignoring search
locations by find_...() commands were fully documented.
Add the missing effects, clarify the wording and restructure the
way the details are assembled to reduce duplication.

Also improve the cross-referencing to ensure all the related
variables are more discoverable.

Issue: #20878
2022-03-13 14:29:05 +11:00
Brad King c4117d9116 ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS too
Since `CMAKE_ARGS` is used to construct the default `CONFIGURE_COMMAND`
for CMake-based external projects, the `LIST_SEPARATOR` option works for
it too.
2022-03-11 11:15:53 -05:00
Brad King 4dd0deca7d Merge branch 'release-3.21' into release-3.22 2022-03-11 10:33:42 -05:00
Brad King 7523a1da6e Merge branch 'AppleClang-cxx20-cxx23-flags' into release-3.22
Merge-request: !7063
2022-03-11 10:33:16 -05:00
Brad King bb99538a45 Merge branch 'AppleClang-cxx20-cxx23-flags' into release-3.21
Merge-request: !7063
2022-03-11 10:33:02 -05:00
Ken Matsui 683e4e9cab AppleClang: Add C++20 and C++23 flags
Follow up commit 886e27062b (Clang/MSVC: C++20 final flag, C++23
support, 2021-05-29, v3.20.4~7^2) with support for AppleClang.
2022-03-11 10:00:21 -05:00
Brad King 736e80dbca CMake 3.23.0-rc3 v3.23.0-rc3 2022-03-10 09:11:13 -05:00
Brad King ed663af8a2 Merge topic 'cuda-arch-off' into release-3.23
7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang
2a79b647fa CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7058
2022-03-10 09:08:04 -05:00
Brad King 7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang
Clang does not automatically choose an architecture supported
by the SDK.  The `OFF` value is meant for users to provide their
own architecture flags, so provide one as part of the test.
2022-03-10 07:10:38 -05:00
Brad King c31f7de574 Merge branch 'release-3.22' into release-3.23 2022-03-10 06:44:26 -05:00
Brad King e3b9338e97 Merge topic 'irsl-oneapi-linux' into release-3.23
3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7057
2022-03-10 06:43:10 -05:00
Brad King ae585bdc12 Merge topic 'ci-msvc-19.31' into release-3.23
f2c303f4c7 Merge branch 'backport-3.22-ci-msvc-19.31' into ci-msvc-19.31
e66de43180 gitlab-ci: Update Windows builds to MSVC 19.31 toolset
fade5b5b8c gitlab-ci: Update Windows builds to MSVC 19.31 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7059
2022-03-10 06:33:55 -05:00
Brad King dfdcb4fc3d Merge branch 'backport-3.22-ci-msvc-19.31' into release-3.22
Merge-request: !7059
2022-03-09 12:59:55 -05:00
Brad King 90a9bff01e Merge branch 'irsl-oneapi-linux' into release-3.22
Merge-request: !7057
2022-03-09 12:58:09 -05:00
Attila Krasznahorkay 3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux
They are stored in a slightly different place with oneAPI than they
used to be in PSXE.

A similar change was made for Windows by commit 956160bb9a (IRSL: Fix
search for Windows redist files with Intel Classic compiler, 2021-09-23,
v3.22.0-rc1~88^2), which left a comment about the locations relative to
the Classic and oneAPI compilers.

Fixes: #23310
2022-03-09 12:53:37 -05:00