Commit Graph

52677 Commits

Author SHA1 Message Date
Kitware Robot aa283fdba1 CMake Nightly Date Stamp 2021-04-10 00:01:04 -04:00
Kitware Robot eb62097dec CMake Nightly Date Stamp 2021-04-09 00:01:21 -04:00
Brad King 46ea05ba65 Merge branch 'release-3.20' 2021-04-08 08:52:20 -04:00
Brad King 9765ccfa71 CMake 3.20.1 v3.20.1 2021-04-08 08:00:50 -04:00
Brad King c35e51936a Merge topic 'newer-git-show'
f71e7b8156 Help/dev/review: mention `--pretty=reference`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5994
2021-04-08 07:53:18 -04:00
Brad King 21f0478ade Merge topic 'presets-optional-generator-and-builddir'
06e6981336 cmake-presets: Make generator and binaryDir fields optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5946
2021-04-08 07:49:56 -04:00
Brad King a0e5998bd6 Merge topic 'ctest-wait-verbosity'
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5990
2021-04-08 07:49:05 -04:00
Brad King ce97e2bdcb Merge topic 'find_threads_only_log_on_failure'
d6da6784bf FindThreads: Reduce amount of false positive error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5988
2021-04-08 07:48:18 -04:00
Brad King e1c054105b Merge branch 'release-3.20' 2021-04-08 07:47:09 -04:00
Brad King f39ea2e292 Merge topic 'flags-with-backslash'
3953dfcb31 Restore support for backslashes in initial language-wide flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5995
2021-04-08 07:47:09 -04:00
Brad King 9be8441c20 Merge topic 'flags-with-backslash' into release-3.20
3953dfcb31 Restore support for backslashes in initial language-wide flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5995
2021-04-08 07:47:08 -04:00
Brad King 34f05129a3 Merge branch 'release-3.20' 2021-04-08 07:46:15 -04:00
Brad King c3fab3e62d Merge topic 'cuda-depfile-ccbin'
8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !5992
2021-04-08 07:46:15 -04:00
Brad King 6d27dd3d98 Merge topic 'cuda-depfile-ccbin' into release-3.20
8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !5992
2021-04-08 07:46:14 -04:00
Brad King 1c3ea34715 Merge branch 'release-3.20' 2021-04-08 07:45:14 -04:00
Brad King fd873ccaee Merge topic 'FindBLAS-default-OpenMP'
9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5993
2021-04-08 07:45:14 -04:00
Brad King d6a0b24d10 Merge topic 'FindBLAS-default-OpenMP' into release-3.20
9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5993
2021-04-08 07:45:13 -04:00
Kitware Robot 8ffd3b4946 CMake Nightly Date Stamp 2021-04-08 00:01:25 -04:00
Brad King 3953dfcb31 Restore support for backslashes in initial language-wide flags
Refactoring in commit bdc40742bd (CMakeDetermineCompilerId: Test without
COMPILER_ID_FLAGS if REQUIRE_SUCCESS, 2021-02-27, v3.20.0-rc3~6^2) added
an extra macro layer through which flag strings are passed.  That caused
an extra level of argument re-parsing, and broke flags with backslashes.
Pass flags to the helper macro through variable names instead.

Fixes: #22041
2021-04-07 13:53:22 -04:00
Ben Boeckel f71e7b8156 Help/dev/review: mention --pretty=reference
This was added in Git 2.25 (13 Jan 2020).
2021-04-07 12:28:57 -04:00
Brad King 9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC
Update the change from commit f7f3d8987a (FindBLAS: Add dependency of
OpenBLAS on OpenMP for BLA_STATIC, 2020-11-10, v3.20.0-rc1~492^2):

* If C is not enabled, find CXX OpenMP libraries instead.

* Do not use BLA_STATIC's custom CMAKE_FIND_LIBRARY_SUFFIXES for OpenMP.
  It can break projects that already call `find_package(OpenMP)` and
  expect a shared library.  Whether OpenMP is static is orthogonal to
  whether BLAS is static.

Fixes: #22039
Issue: #16221
2021-04-07 11:26:07 -04:00
Brad King 8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler
Since commit 2c71d051fa (Makefiles Generators: use compiler for
dependencies generation, 2020-10-18, v3.20.0-rc1~392^2) we invoke `nvcc`
for CUDA < 10.2 a second time in order to generate a depfile.  When
`CMAKE_CUDA_HOST_COMPILER` is set, the second invocation is missing its
`-ccbin=` option, even after refactoring in commit 8981e3e7cc
(NVIDIA-CUDA: rely on new capabilities for deps generation, 2020-12-02,
v3.20.0-rc1~362^2).

Ideally we should move the `-ccbin=` flag into `Compiler/NVIDIA-CUDA`,
but that will add `CMAKE_CUDA_HOST_COMPILER` support on Windows in
command-line generators but not the Visual Studio generators.
For now, add the flag to the depfile command specifically.

Fixes: #22037
2021-04-07 10:54:27 -04:00
Brad King 9a6320eb88 Merge branch 'release-3.20' 2021-04-07 10:08:09 -04:00
Brad King 79562b03c1 Merge topic 'binutils-var-private'
4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5986
2021-04-07 10:08:09 -04:00
Brad King f8af94a212 Merge topic 'binutils-var-private' into release-3.20
4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5986
2021-04-07 10:08:08 -04:00
Brad King 49f4f15b8c Merge branch 'release-3.20' 2021-04-07 10:06:56 -04:00
Brad King 6968500352 Merge topic 'ios-rpath-linker-flag'
4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5980
2021-04-07 10:06:56 -04:00
Brad King 196376a33e Merge topic 'ios-rpath-linker-flag' into release-3.20
4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5980
2021-04-07 10:06:55 -04:00
Brad King a1847844f0 Merge topic 'FindHDF5-find-fortran-modules-automatically'
cd48433e96 FindHDF5: add compiler-specific module search paths
78287ec0af FindHDF5: track the "main" library for each language
3654068e80 FindHDF5: find include directories after the library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5977
2021-04-07 08:46:53 -04:00
Brad King b962b9cf1d Merge topic 'autouic-source-group-fixes'
e8ddc1e268 Autogen: Fix a bug in setting the UIC source group
7f0151dc91 Help: Document the AUTOUIC_SOURCE_GROUP property
f6c47dd0b4 Help: Fix a typo in the AUTOGEN_SOURCE_GROUP help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexey Edelev <alexey.edelev@qt.io>
Merge-request: !5978
2021-04-07 08:45:06 -04:00
Brad King 4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix
Refactoring in commit b12aec6c8d (BinUtils: prefer bin utils matching
the compiler version extension, 2020-12-11, v3.20.0-rc1~171^2)
accidentally leaked a `TOOL` variable.  Name temporary variables with a
private prefix.

Fixes: #22035
2021-04-07 08:43:45 -04:00
Kitware Robot a8b6b54239 CMake Nightly Date Stamp 2021-04-07 00:06:15 -04:00
friendlyanon 06e6981336 cmake-presets: Make generator and binaryDir fields optional
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.

Fixes: #21987
2021-04-07 01:24:44 +02:00
Robert Maynard d6da6784bf FindThreads: Reduce amount of false positive error logging
When a CMake based project fails, users start looking at
CMakeError.log and think that the FindThread output is
the problem, but it is a false positive.

Now FindThreads only logs to `CMakeError.log` when it fails
to find a suitable flag, reducing the amount of false positives in `CMakeError.log`.

Fixes #16540, Fixes #19344
2021-04-06 15:51:34 -04:00
Brad King 82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
These messages are incidental scheduling output.  Avoid cluttering
the normal verbose output showing tests starting and finishing.
2021-04-06 14:48:14 -04:00
Brad King 46393e8977 Merge branch 'release-3.20' 2021-04-06 14:07:49 -04:00
Brad King 9780079ba6 Merge branch 'release-3.19' into release-3.20 2021-04-06 14:07:31 -04:00
Brad King 0b5a42c8ea Merge branch 'release-3.19' 2021-04-06 14:07:12 -04:00
Brad King c9b27dace7 CMake 3.19.8 v3.19.8 2021-04-06 13:21:53 -04:00
Brad King 80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag 2021-04-06 12:42:41 -04:00
Brad King b4c3e8e8e7 Merge topic 'ci-linux-updates' into release-3.20
c6a45968d6 ci: Enable jq-based tests on Linux builds
8ca8b74a96 ci: add jq and DevIL to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5987
2021-04-06 11:10:46 -04:00
Brad King 4c5c0c5f5d Merge branch 'release-3.20' 2021-04-06 11:10:46 -04:00
Brad King 6a31c82788 Merge topic 'ci-linux-updates'
1035848e9c ci: Enable FindDevIL tests on Linux builds
be023ff4db Merge branch 'backport-ci-linux-updates' into ci-linux-updates
c6a45968d6 ci: Enable jq-based tests on Linux builds
8ca8b74a96 ci: add jq and DevIL to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5987
2021-04-06 11:10:46 -04:00
Brad King 1035848e9c ci: Enable FindDevIL tests on Linux builds 2021-04-06 10:49:45 -04:00
Brad King be023ff4db Merge branch 'backport-ci-linux-updates' into ci-linux-updates 2021-04-06 10:49:39 -04:00
Brad King c6a45968d6 ci: Enable jq-based tests on Linux builds 2021-04-06 10:49:17 -04:00
Brad King 8ca8b74a96 ci: add jq and DevIL to Debian and Fedora base images 2021-04-06 10:49:16 -04:00
Brad King 8ddbb6851d Merge branch 'release-3.20' 2021-04-06 08:46:34 -04:00
Brad King b826393377 Merge branch 'release-3.19' 2021-04-06 08:46:32 -04:00
Brad King 11f2777c1a Merge branch 'release-3.18' 2021-04-06 08:46:30 -04:00