Brad King authored 3 years ago and Kitware Robot committed 3 years ago

07f9ce4f Merge branch 'upstream-expat' into update-expat
4c031b94 expat 2022-02-20 (65a21f2b)
9d035ba2 expat: Update script to get Expat 2.4.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7015

# By Expat Upstream
* upstream-expat:
  expat 2022-02-20 (65a21f2b)

Kitware Robot authored 3 years ago and Brad King committed 3 years ago

Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 65a21f2b2a306d29b44e70264aca948aa0454219 (R_2_4_6).

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

f75299b8 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7007

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

65e4d29e CheckTypeSize: Modernize and clarify documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7006

Since commit 8f64df0a (CUDA: Generic all and all-major support,
2021-12-19, v3.23.0-rc1~23^2), setting `CUDA_ARCHITECTURES` to a value
other than `all` or `all-major` is ignored with NVCC 11.5+.  Fix the
logic to return early only when actually using an "all" value.

Fixes: #23243

Spell out the list of result variables as a definition list rather
than in prose.

Fixes: #23247

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

7083b194 cmake: When given multiple source paths use last instead of first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7001

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

058b8a0b install(): Properly ignore FILE_SETs that don't exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7000

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

5bfff3c7 Tests: Add missing guards on Qt4 and Qt5 tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6998

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

483a1c24 libarchive: Fix OpenSSL crypto library checks for build inside CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6997

Robert Maynard authored 3 years ago and Brad King committed 3 years ago

When given two source paths via `-S` or just directory paths prefer
the last one. When the paths are mixed always prefer the last `-S`
entry.

Fixes: #23238

Fixes: #22960

Merge-request: !6998

Add missing `CMake_TEST_Qt{4,5}` conditions on Qt4 an Qt5 tests.
Configuring CMake with `-DCMake_TEST_Qt5=OFF` should prevent any
attempt to search for Qt5.

Fixes: #23239

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

f73457ca cmake: Ignore any empty "" command line arguments
67f97f54 Tests: Add RunCMake helper to run cmake with raw execute_process args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6980

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

a7ef59c9 Tests: Fix CudaOnly.SeparateCompilationPTX test project name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6991

libarchive's crypto library checks use its `config.h` inside the
`try_compile` project.  Since commit ade3b16e (libarchive: Use KWIML
to get fixed-size integer types, 2020-06-01, v3.18.0-rc1~33^2),
that header depends on KWIML inside CMake.  Add the include directory
for KWIML to the crypto library checks.  Otherwise, they always fail
due to not finding the KWIML headers, and libarchive decides not
to link the crypto library.

libarchive has other code besides the hash algorithms that depends on
the crypto library if its ENABLE_OPENSSL option is enabled (which in
CMake is controlled by CMAKE_USE_OPENSSL).  It seems to be missing some
conditions to link the crypto library in those cases, and instead relies
on at least one of the above-mentioned checks to pass.  If they all
fail, and we are using system curl, we might not link the crypto
library.

Fixes: #23234

Robert Maynard authored 3 years ago and Brad King committed 3 years ago

Don't treat empty quote arguments("") as the current working
directory but instead ignore them.

Fixes #23217

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

c1e812ad target_link_libraries: Improve tolerance of unquoted generator expressions
5571a316 target_link_libraries: Handle keyword arguments in dedicated code path
42590df9 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

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

44f7238d FindGLUT: Use link directories for libs from pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6985

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

449f3434 FindHDF5: Tolerate failure during compiler interrogation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6983

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

d92469e5 Help: Clarify how package resolve mode is intended to be used
f320a310 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

e163908a Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982

Fix the test added by commit 61b9764b (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.

Prior to commit 1d709ea2 (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

Since commit daa6d2bc (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.

Axel Huebl authored 3 years ago and Brad King committed 3 years ago

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.

Merge-request: !6985

Silvio Traversaro authored 3 years ago and Brad King committed 3 years ago

Since commit f90d1545 (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

Carsten Rudolph authored 3 years ago and Brad King committed 3 years ago

Fixes: #23223

Carsten Rudolph authored 3 years ago and Brad King committed 3 years ago

Fixes: #23224

Improve the documentation added by commit ec8d37b3 (VS: Support
version specification in CMAKE_GENERATOR_INSTANCE, 2021-10-26,
v3.23.0-rc1~452^2~1).

Fixes: #23225