Commit Graph

52699 Commits

Author SHA1 Message Date
Marc Chevrier
d67cc4882d Xcode: Add support of DEPFILE for add_custom_command
Issue: #20286
2021-04-15 12:17:31 -04:00
Kitware Robot
498b916cdd CMake Nightly Date Stamp 2021-04-15 00:04:10 -04:00
Brad King
ff9e922902 Merge branch 'release-3.20' 2021-04-14 11:04:30 -04:00
Brad King
7981602368 Merge topic 'openbsd-defines'
317a477283 OpenBSD: Fix system feature definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6000
2021-04-14 11:04:30 -04:00
Brad King
b4a29a8d42 Merge topic 'openbsd-defines' into release-3.20
317a477283 OpenBSD: Fix system feature definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6000
2021-04-14 11:04:29 -04:00
Rafael Sadowski
317a477283 OpenBSD: Fix system feature definitions
Since commit f034b0f663 (CMake compilation: do not use compiler
extensions, 2020-03-14, v3.18.0-rc1~494^2), some sources explicitly
enable needed system APIs on some platforms using definitions like
`_POSIX_C_SOURCE` and `_XOPEN_SOURCE`.  Drop the definitions for
OpenBSD, which provides the POSIX APIs by default.
2021-04-14 11:02:29 -04:00
Brad King
1f91cf3442 Merge topic 'add_custom_command-DEPFILE-genex'
0c47b91fcc Genex: add_custom_command: DEPFILE supports genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5998
2021-04-14 10:57:17 -04:00
Brad King
af2ce59191 Merge topic 'vs-autouic-on-ui-file-change'
a8d879cf45 Autogen: Add detection of UI file changes to the pre-build VS case
1876f2d03f Autogen: Move duplicated filename generation code into a function
087b717aef Autogen: Move duplicated executable dependency code into a function
0656bebeae Autogen: Rename the variable for UI files with UIC options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5999
2021-04-14 10:56:31 -04:00
Brad King
b5a07b2333 Merge branch 'release-3.20' 2021-04-14 10:55:18 -04:00
Brad King
337b39d342 Merge topic 'ci-parallelism-limits'
3fd2cffb4d ci: limit builds by machine load
6317f92120 ci: pay attention to the machine load when running tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5989
2021-04-14 10:55:18 -04:00
Brad King
d96ae57fb6 Merge topic 'ci-parallelism-limits' into release-3.20
3fd2cffb4d ci: limit builds by machine load
6317f92120 ci: pay attention to the machine load when running tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5989
2021-04-14 10:55:17 -04:00
Kitware Robot
156504fe75 CMake Nightly Date Stamp 2021-04-14 00:01:04 -04:00
Kitware Robot
4bfe724e81 CMake Nightly Date Stamp 2021-04-13 00:01:05 -04:00
Marc Chevrier
0c47b91fcc Genex: add_custom_command: DEPFILE supports genex
This facility is very useful for 'Ninja Multi-Config' and required
as well for future support of DEPFILE in 'Xcode' and 'Visual Studio'
generators (#20286).
2021-04-12 13:06:49 +02:00
Kitware Robot
43ecda68eb CMake Nightly Date Stamp 2021-04-12 00:01:08 -04:00
Kitware Robot
b1c739ad8b CMake Nightly Date Stamp 2021-04-11 00:01:04 -04:00
Duncan Barber
a8d879cf45 Autogen: Add detection of UI file changes to the pre-build VS case
This is achieved by adding a rule file which carries the UI files as dependencies but performs no meaningful command. Its output path points to a timestamp file which is instead touched by the pre-build command that runs autogen. The rule file therefore triggers the build if any of the files have been changed more recently than the last autogen run.

Fixes: #17959
Fixes: #18741
2021-04-10 18:40:22 +01:00
Duncan Barber
1876f2d03f Autogen: Move duplicated filename generation code into a function 2021-04-10 18:33:24 +01:00
Duncan Barber
087b717aef Autogen: Move duplicated executable dependency code into a function 2021-04-10 18:33:23 +01:00
Duncan Barber
0656bebeae Autogen: Rename the variable for UI files with UIC options
Monitoring for UI file changes in the target sources will require keeping track of the files without options as well so this will improve clarity.
2021-04-10 18:33:22 +01:00
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