mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 00:59:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,662 Commits 2 Branches 391 Tags
f39ea2e292079707feceeb256b242d8f41b71ee9
Commit Graph

52662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Brad King
c80583d519 Merge branch 'release-3.19' into release-3.20 2021-04-06 08:46:21 -04:00
Brad King
4dde23c2ab Merge branch 'release-3.20' 2021-04-06 08:44:54 -04:00
Brad King
2d7e20dbbd Merge topic 'rel-file-table' 
e17006c497 Utilities/Release: Add deprecation fields to File Table v1
89ab613248 Utilities/Release: Update file table for 3.20.0
c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table
f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table
30959aec8f Utilities/Release: Update file table for 3.19.3
d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table
004dbbaddd Utilities/Release: Update file table for 3.19.2
1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5961
 2021-04-06 08:44:54 -04:00
Brad King
2e029ec598 Merge topic 'rel-file-table' into release-3.20 
e17006c497 Utilities/Release: Add deprecation fields to File Table v1
89ab613248 Utilities/Release: Update file table for 3.20.0
c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table
f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table
30959aec8f Utilities/Release: Update file table for 3.19.3
d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table
004dbbaddd Utilities/Release: Update file table for 3.19.2
1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5961
 2021-04-06 08:44:53 -04:00
Brad King
48f9a152bb Merge branch 'backport-3.19-rel-file-table' into release-3.19 2021-04-06 08:43:24 -04:00
Brad King
ea7290a7a2 Merge branch 'release-3.18' into release-3.19 2021-04-06 08:42:54 -04:00
Brad King
d0568edd40 Merge branch 'backport-3.18-rel-file-table' into release-3.18 
Merge-request: !5961
 2021-04-06 08:42:23 -04:00
Ben Boeckel
cd48433e96 FindHDF5: add compiler-specific module search paths 2021-04-06 08:36:31 -04:00
Ben Boeckel
78287ec0af FindHDF5: track the "main" library for each language 
This will be used to build up additional include paths to search.
 2021-04-06 08:36:31 -04:00
Ben Boeckel
3654068e80 FindHDF5: find include directories after the library 
Some include paths might depend on the library location (primarily for
Fortran).
 2021-04-06 08:36:31 -04:00
Brad King
f0527dee52 Merge topic 'Test_min_version' 
f6b4db365a Tests: bump cmake_minimum_required version to 2.8.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5979
 2021-04-06 08:33:54 -04:00
Brad King
c41100cbb2 Merge branch 'release-3.20' 2021-04-06 08:32:35 -04:00
Brad King
e061a201b6 Merge topic 'nvhpc-lib-arch' into release-3.20 
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5984
 2021-04-06 08:32:34 -04:00
Brad King
ebc812a8d1 Merge topic 'nvhpc-lib-arch' 
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5984
 2021-04-06 08:32:34 -04:00
Brad King
9c43461418 Merge branch 'release-3.20' 2021-04-06 08:31:41 -04:00