Commit Graph

56364 Commits

Author SHA1 Message Date
Brad King 48933f5160 Merge topic 'LINK_LIBRARY-updates'
397ee55cd6 genex-LINK_LIBRARY: rename configuration variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6994
2022-02-17 08:48:28 -05:00
Brad King 4ee96f6e77 Merge topic 'test-RunCMake-xcodebuild-incidental'
6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6992
2022-02-17 08:46:53 -05:00
Brad King ae9536d95a Merge branch 'release-3.23' 2022-02-17 08:45:53 -05:00
Brad King 9f1f443e83 Merge topic 'cmake-empty-cmd-line-arg'
f73457ca2e cmake: Ignore any empty "" command line arguments
67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6980
2022-02-17 08:45:53 -05:00
Brad King 9c81f2cb8b Merge topic 'cmake-empty-cmd-line-arg' into release-3.23
f73457ca2e cmake: Ignore any empty "" command line arguments
67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6980
2022-02-17 08:45:52 -05:00
Brad King 70d5a64dde Merge branch 'release-3.23' 2022-02-17 08:43:40 -05:00
Brad King 43511abb44 Merge topic 'test-cuda-sepcomp-ptx'
a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6991
2022-02-17 08:43:40 -05:00
Brad King ed9e7a2732 Merge topic 'test-cuda-sepcomp-ptx' into release-3.23
a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6991
2022-02-17 08:43:39 -05:00
Kitware Robot e61cc03ebf CMake Nightly Date Stamp 2022-02-17 00:01:12 -05:00
Marc Chevrier 397ee55cd6 genex-LINK_LIBRARY: rename configuration variables
To be more consistent between genex and variables as well as
the forecomming LINK_GROUP genex, rename variable *_LINK_USING_<FEATURE>*
in *_LINK_LIBRARY_USING_<FEATURE>*
2022-02-16 18:34:28 +01:00
Robert Maynard f73457ca2e cmake: Ignore any empty "" command line arguments
Don't treat empty quote arguments("") as the current working
directory but instead ignore them.

Fixes #23217
2022-02-16 12:11:33 -05:00
Brad King 67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args 2022-02-16 12:10:19 -05:00
Brad King 6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...] Requested but did not find extension point with
                        identifier ...

Teach RunCMake to drop such incidental lines before matching against
expected output.
2022-02-16 11:21:54 -05:00
Brad King 1e495fdab9 Merge branch 'release-3.23' 2022-02-16 09:47:46 -05:00
Brad King 1659a6918a Merge topic 'tll-genex-concat'
c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions
5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path
42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6989
2022-02-16 09:47:46 -05:00
Brad King 368dc57979 Merge topic 'tll-genex-concat' into release-3.23
c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions
5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path
42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6989
2022-02-16 09:47:45 -05:00
Brad King 0de768be7a Merge branch 'release-3.23' 2022-02-16 09:43:57 -05:00
Brad King 625913b429 Merge branch 'release-3.22' 2022-02-16 09:43:55 -05:00
Brad King bd575a2918 Merge branch 'release-3.22' into release-3.23 2022-02-16 09:43:48 -05:00
Brad King 8c854e43b9 Merge branch 'release-3.23' 2022-02-16 09:42:54 -05:00
Brad King ba78776a94 Merge topic 'FindGLUT-link-dirs'
44f7238d5d FindGLUT: Use link directories for libs from pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6985
2022-02-16 09:42:54 -05:00
Brad King 809cb5b76a Merge topic 'FindGLUT-link-dirs' into release-3.23
44f7238d5d FindGLUT: Use link directories for libs from pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6985
2022-02-16 09:42:53 -05:00
Brad King f29c4f55cf Merge branch 'release-3.23' 2022-02-16 09:41:58 -05:00
Brad King 1f4976d959 Merge topic 'FindHDF5-info-binary-exists' into release-3.23
449f343498 FindHDF5: Tolerate failure during compiler interrogation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6983
2022-02-16 09:41:57 -05:00
Brad King f15b338755 Merge topic 'FindHDF5-info-binary-exists'
449f343498 FindHDF5: Tolerate failure during compiler interrogation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6983
2022-02-16 09:41:57 -05:00
Brad King c4082a22ff Merge branch 'release-3.23' 2022-02-16 09:41:03 -05:00
Brad King 731bdec8b9 Merge topic 'vs-package-restore-docs'
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
2022-02-16 09:41:03 -05:00
Brad King 319584711c Merge topic 'vs-package-restore-docs' into release-3.23
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
2022-02-16 09:41:02 -05:00
Brad King 1c62bf6a6d Merge branch 'release-3.23' 2022-02-16 09:39:00 -05:00
Brad King 6e32d3a668 Merge topic 'doc-vs-instance-version'
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
2022-02-16 09:39:00 -05:00
Brad King be87b7661c Merge topic 'doc-vs-instance-version' into release-3.23
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
2022-02-16 09:38:59 -05:00
Brad King c46ed01fa0 Merge topic 'file-download-range'
231872ddb0 file(DOWNLOAD): Add options to download a range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6986
2022-02-16 09:37:33 -05:00
Brad King 82acb05018 Merge topic 'LINK_LIBRARY-framework'
a2cfa2da4f GenEx/LINK_LIBRARY: Add features for framework support on Apple
40178f3c90 cmGlobalGenerator: Add helper to split framework path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6967
2022-02-16 09:36:38 -05:00
Brad King a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name
Fix the test added by commit 61b9764b03 (CUDA: Allow both
CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATION, 2021-09-17,
v3.23.0-rc1~516^2) to have a `project()` name matching what
is passed to CTest's `--build-project` option.  Otherwise, on
VS builds, MSBuild warns:

    MSBUILD : error MSB1009: Project file does not exist.

Other CUDA tests use a matching project name already.
2022-02-16 09:21:59 -05:00
Kitware Robot fa8231ffac CMake Nightly Date Stamp 2022-02-16 00:01:11 -05:00
Brad King c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions
Prior to commit 1d709ea2f5 (cmGeneratorTarget: Propagate backtraces from
INTERFACE_LINK_LIBRARIES, 2021-12-15, v3.23.0-rc1~228^2), the value of
`INTERFACE_LINK_LIBRARIES` was a single string.  If an unquoted
generator expression passed to `target_link_libraries` contained `;` and
became multiple arguments, they would all accumulate as a single
`;`-separated list in the value of `INTERFACE_LINK_LIBRARIES`.  Since
that commit, each argument to `target_link_libraries` is placed in
`INTERFACE_LINK_LIBRARIES` as a separate entry, as has long been the
case for `LINK_LIBRARIES`. That behavior change broke projects that were
accidentally relying on accumulation in `INTERFACE_LINK_LIBRARIES` to
produce complete generator expressions containing `;`.

Teach `target_link_libraries` to accumulate consecutive non-keyword
arguments into a single entry before placing them in `LINK_LIBRARIES` or
`INTERFACE_LINK_LIBRARIES`.  For example, treat `a b c` as if they were
written as `"a;b;c"`.  This restores the previously accidental support
for unquoted generator expressions in `INTERFACE_LINK_LIBRARIES`, and
also enables it for `LINK_LIBRARIES`.

For now, do not drop the `target_link_libraries` documentation that
recommends quoting generator expressions.  Quoting is still important to
populate `LINK_LIBRARIES` in CMake 3.22 and below, and is also good
practice to keep generator expressions whole.

Fixes: #23203
2022-02-15 17:38:33 -05:00
Brad King 5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path 2022-02-15 17:17:49 -05:00
Brad King 42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check
Since commit daa6d2bc04 (ENH: updated handling of debug and optimized
target link libraries, 2006-11-29, v2.6.0~2471) the ancient
`<lib>_LINK_TYPE` compatibility lookup was done using the name of the
dependent target for which `target_link_libraries` is called, rather
than the name of the library dependency being considered.  This code
probably does nothing.  Remove it.
2022-02-15 17:17:49 -05:00
m.klimenko 231872ddb0 file(DOWNLOAD): Add options to download a range 2022-02-15 22:08:06 +03:00
Axel Huebl 449f343498 FindHDF5: Tolerate failure during compiler interrogation
Check that the file that is accessed via `file(STRINGS...)` truly
exists.

This is not the case in some EMSCRIPTEN/WebASM builds where we want to
overwrite the HDF5 find logic manually. The missing check here prevents
that one can overwrite the search logic in exotic environments.
2022-02-15 10:44:29 -05:00
Brad King 3596758811 Merge branch 'FindGLUT-link-dirs' into release-3.22
Merge-request: !6985
2022-02-15 10:37:11 -05:00
Silvio Traversaro 44f7238d5d FindGLUT: Use link directories for libs from pkg-config
Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if
available, 2021-06-11, v3.22.0-rc1~469^2), the `GLUT_LIBRARIES` may come
from `pkg-config`, in which case they may be `-l` flags instead of
absolute paths.  Propagate `GLUT_LIBRARY_DIRS` to GLUT::GLUT too.

Fixes: #23229
2022-02-15 10:35:11 -05:00
Carsten Rudolph d92469e572 Help: Clarify how package resolve mode is intended to be used
Fixes: #23223
2022-02-15 10:20:14 -05:00
Carsten Rudolph f320a31087 cmake --build: prioritize --resolve-package-references over preset
Fixes: #23224
2022-02-15 10:20:02 -05:00
Brad King e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE
Improve the documentation added by commit ec8d37b3b1 (VS: Support
version specification in CMAKE_GENERATOR_INSTANCE, 2021-10-26,
v3.23.0-rc1~452^2~1).

Fixes: #23225
2022-02-15 10:06:12 -05:00
Brad King f76809c892 Merge topic 'cpack-rpm-component-var-off'
114a04f89c CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6963
2022-02-15 09:54:57 -05:00
Brad King bdc6f379e1 Merge topic 'ci-windows-no-java'
4b90688aa0 ci: Explicitly disable Java tests on Windows with Borland and Open Watcom

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6979
2022-02-15 09:53:55 -05:00
Brad King 65cef33578 Merge branch 'release-3.23' 2022-02-15 09:52:50 -05:00
Brad King 7eec19f469 Merge branch 'release-3.22' 2022-02-15 09:52:48 -05:00
Brad King e5a5f3b76f Merge branch 'release-3.22' into release-3.23 2022-02-15 09:52:42 -05:00