Commit Graph

53970 Commits

Author SHA1 Message Date
Kitware Robot 4e17e90988 CMake Nightly Date Stamp 2021-07-16 00:01:08 -04:00
Brad King dab05a1af2 Merge branch 'release-3.21' 2021-07-15 10:54:40 -04:00
Brad King bf10664032 Merge topic 'ci-use-3.21.0'
79e139e3d3 ci: use CMake 3.21.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6349
2021-07-15 10:54:40 -04:00
Brad King 7c6234dd21 Merge topic 'ci-use-3.21.0' into release-3.21
79e139e3d3 ci: use CMake 3.21.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6349
2021-07-15 10:54:39 -04:00
Brad King 23e87ae163 Merge topic 'findblaslapack-cray'
76487b04b1 Find{BLAS,LAPACK}: clean variables
fc54e68c05 Find{BLAS,LAPACK}: improve found message on Cray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6348
2021-07-15 10:50:22 -04:00
Kitware Robot 769c539d59 CMake Nightly Date Stamp 2021-07-15 00:01:14 -04:00
Ben Boeckel 79e139e3d3 ci: use CMake 3.21.0 2021-07-14 13:25:51 -04:00
Brad King 9f063f6a10 Merge branch 'release-3.21' 2021-07-14 11:13:17 -04:00
Seth R Johnson 76487b04b1 Find{BLAS,LAPACK}: clean variables 2021-07-14 11:00:20 -04:00
Seth R Johnson fc54e68c05 Find{BLAS,LAPACK}: improve found message on Cray
With Cray compiler wrappers (implicitly tested on OLCF Spock) the
BLAS and LAPACK libraries are automatically linked as necessary through
the wrapper script and programming environment. With this change, the
configure output is:
```
-- Found BLAS: implicitly linked
<snip>
-- Found LAPACK: implicitly linked
```
rather than
```
-- Found BLAS: 1
<snip>
-- Found LAPACK: LAPACK_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES
```
2021-07-14 10:59:59 -04:00
Brad King ff7a2e37bf CMake 3.21.0 v3.21.0 2021-07-14 10:10:23 -04:00
Brad King bf97f38a18 Merge branch 'release-3.21' 2021-07-14 10:06:29 -04:00
Brad King 80ca30704f Merge topic 'armlink_armar_detection' into release-3.21
509ef50a06 ARMClang: Fix regression in check for working compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6346
2021-07-14 10:06:29 -04:00
Brad King f166d32576 Merge topic 'armlink_armar_detection'
509ef50a06 ARMClang: Fix regression in check for working compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6346
2021-07-14 10:06:29 -04:00
Lingkai Dong 509ef50a06 ARMClang: Fix regression in check for working compiler
Given the compiler to use, `CMakeFindBinUtils.cmake` automatically
determines a number of tools including linker (CMAKE_LINKER) and archiver
(CMAKE_AR) and stores them in a generated file `CMakeCCompiler.cmake` as
non-CACHE entries. The compiler-specific ARMClang.cmake then tries to
override CMAKE_LINKER and CMAKE_AR as CACHE entries.

Following the introduction of CMP0126, which is set to NEW in the test
for a working compiler, setting a CACHE entry does not replace a normal
entry of the same name anymore, resulting in a failed test due to wrong
linker and archiver.

To fix this, set CMAKE_LINKER and CMAKE_AR for ARMClang directly in
`CMakeFindBinUtils.cmake` as is done for other compilers.  Check
for them in `ARMClang.cmake` to safeguard cases when a project explicitly
includes `ARMClang.cmake` prior to compiler determination (which some
projects do to work around other problems in older CMake versions).
2021-07-14 09:45:09 -04:00
Brad King 89039dfed8 Merge topic 'FindPkgConfig-LIBRARY_PATH'
36979f5b43 FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6345
2021-07-14 09:28:39 -04:00
Brad King 5e8a29c10b Merge topic 'cpack-deb-debuginfo'
9dc007e17c Refactor: Drop redundand `std::endl` calls in the middle of output
afcc5449e8 Refactor: Use `cmStrToLong` instead of `std::strtol`
13549674cc Refactor: Avoid duplicate calls to `GetOption("GEN_DBGSYMDIR")`
7add10f288 Refactor: Deduplicate code of `createDebPackages()`
593ff734b0 CPack/DEB: dbgsym package not generated for non-component packaging
c8f298ae08 Refactor: Extract packaged files finder into a function
7fd3134ea1 Refactor: cmCPackDebGenerator::PackageComponents handle `else` first
008321595a Refactor: Change return value to bool for private members
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6342
2021-07-14 09:26:36 -04:00
Brad King 17f5b4446c Merge topic 'link-item-cleanup'
d9e4b47432 cmGeneratorTarget: Clarify logic recognizing explicit link interface
ff97944806 cmGeneratorTarget: Clarify cmLinkImplItem constructor call
8112480921 cmGeneratorTarget: Clarify ExpandLinkItems local variable role
33f0505f01 cmGeneratorTarget: Simplify ExpandLinkItems signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6347
2021-07-14 09:25:22 -04:00
Brad King bc4350da84 Merge topic 'FindMPI-cray-interrogate'
d9fcbb06f2 FindMPI: Interrogate Cray compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6264
2021-07-14 09:24:23 -04:00
Brad King 58ac5435e1 Merge branch 'release-3.21' 2021-07-14 09:22:27 -04:00
Brad King bf8bf11fe5 Merge topic 'doc-cmake-build-signature'
161f1f42d6 Help: Clarify 'cmake --build' signature alternatives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6343
2021-07-14 09:22:27 -04:00
Brad King 5e75fd6b94 Merge topic 'doc-cmake-build-signature' into release-3.21
161f1f42d6 Help: Clarify 'cmake --build' signature alternatives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6343
2021-07-14 09:22:26 -04:00
Kitware Robot e274bd6fd9 CMake Nightly Date Stamp 2021-07-14 00:01:12 -04:00
Brad King d9e4b47432 cmGeneratorTarget: Clarify logic recognizing explicit link interface 2021-07-13 11:53:00 -04:00
Brad King ff97944806 cmGeneratorTarget: Clarify cmLinkImplItem constructor call 2021-07-13 11:52:59 -04:00
Brad King 8112480921 cmGeneratorTarget: Clarify ExpandLinkItems local variable role 2021-07-13 11:52:58 -04:00
Brad King 33f0505f01 cmGeneratorTarget: Simplify ExpandLinkItems signature 2021-07-13 11:31:16 -04:00
Brad King 36979f5b43 FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment
Tell `pkg-config --libs` not to filter out `-L` flags for entries of
`PKG_CONFIG_SYSTEM_LIBRARY_PATH` (and `LIBRARY_PATH` for `pkgconf`).
We should always search everywhere the `.pc` file expects.

Fixes: #22148
2021-07-13 10:33:16 -04:00
Axel Huebl d9fcbb06f2 FindMPI: Interrogate Cray compiler
Cray traditionally does not ship mpicc/mpic++ compiler wrappers.
Due to that, the traditional CMake logic to find MPI is to *only*
support MPI on Cray systems if either

1. Cray Wrappers are used for compiling, or
2. an auxiliary MPI executable is found.

On many new Exascale prototypes, using the Cray wrappers for develop
work is extremely painful. Vendors such as AMD and integrators such
as HPE seem not to go well in lock-step in Cray programming envs,
making offloading with Cray wrappers too challenging. On the other
hand, using the working experimental Vendor compilers works well,
as long as one does not need MPI.

Extend the fallback MPI search logic by also interrogating the
CC/cc/ftn binaries if found for their MPI flags. This does not
change existing logic, i.e. using the Cray wrappers directly, but
provides an additional way to get MPI programs compiled on Cray.

Fixes: #22368
2021-07-13 09:47:51 -04:00
Alex Turbov 9dc007e17c Refactor: Drop redundand std::endl calls in the middle of output 2021-07-13 16:42:04 +03:00
Brad King 161f1f42d6 Help: Clarify 'cmake --build' signature alternatives
Documentation added by

* commit 4f4f2028b8 (Help: Add documentation for buildPresets and
                     testPresets, 2021-01-13, v3.20.0-rc1~51^2~7)
* commit 676ecf0d37 (cmake-presets: Add build and test presets,
                     2020-12-14, v3.20.0-rc1~51^2~6)

used square brackets in the `cmake --build` signature to indicate
non-optional alternatives, which is not a typical convention.
A common convention is to use parentheses instead, but in this
case it is probably clearer to list the two signatures separately.

Fixes: #22413
2021-07-13 09:41:26 -04:00
Alex Turbov afcc5449e8 Refactor: Use cmStrToLong instead of std::strtol 2021-07-13 08:56:39 -04:00
Alex Turbov 13549674cc Refactor: Avoid duplicate calls to GetOption("GEN_DBGSYMDIR") 2021-07-13 08:36:12 -04:00
Alex Turbov 7add10f288 Refactor: Deduplicate code of createDebPackages()
Also, fix incorrect `retval` accumulation.
2021-07-13 08:36:12 -04:00
Alex Turbov 593ff734b0 CPack/DEB: dbgsym package not generated for non-component packaging
Fix: #19735
2021-07-13 08:36:12 -04:00
Alex Turbov c8f298ae08 Refactor: Extract packaged files finder into a function 2021-07-13 08:36:12 -04:00
Alex Turbov 7fd3134ea1 Refactor: cmCPackDebGenerator::PackageComponents handle else first
Also, return early to reduce nesting level of the function body.
2021-07-13 08:35:27 -04:00
Alex Turbov 008321595a Refactor: Change return value to bool for private members
The `cmCPackDebGenerator::createDeb()` and `cmCPackDebGenerator::createDbgsymDDeb()`
in fact have boolean return value.
2021-07-13 08:35:27 -04:00
Alex Turbov 45a6fa0c33 Refactor: Drop unnecessary if before return 2021-07-13 08:35:27 -04:00
Alex Turbov 700abe7bca Refactor: Drop useless assignments of retval before return 2021-07-13 08:35:27 -04:00
Brad King 460e812369 Merge topic 'cpack-deb-lib-multiarch'
68b961d361 CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6341
2021-07-13 08:25:20 -04:00
Brad King 3265fa51cd Merge topic 'ctest-environment-modifications'
de4f1f26b0 CTest: add an ENVIRONMENT_MODIFICATION property
4c757fa3c8 Help/prop_test/ENVIRONMENT: clarify the scope of the changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6299
2021-07-13 08:24:36 -04:00
Brad King 95c97a12e8 Merge topic 'state-project-kind'
6c440ea3ce cmake: Model normal and try-compile project kinds explicitly
2065bd73cb cmState: Construct with mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6337
2021-07-13 08:23:18 -04:00
Brad King 48abfe9976 Merge topic 'UseSWIG-dependencies-VS-generators'
d1bece92d5 UseSWIG: Use swig generated dependencies for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6327
2021-07-13 08:22:28 -04:00
Brad King 18b3568018 Merge topic 'ctest-libuv-exe-network-path'
113cc4c684 libuv: Allow windows UNC path with forward slashes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6330
2021-07-13 08:21:25 -04:00
Brad King 8fcd3ecb2a Merge topic 'vs-CMAKE_MSVCIDE_RUN_PATH'
542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6334
2021-07-13 08:20:36 -04:00
Brad King 00e8292434 Merge topic 'file-grd-arch' into release-3.21
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6339
2021-07-13 08:18:32 -04:00
Brad King f16cf13c12 Merge branch 'release-3.21' 2021-07-13 08:18:32 -04:00
Brad King 235795d502 Merge topic 'file-grd-arch'
5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally
17aa96bb7a Merge branch 'master' into file-grd-arch
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6339
2021-07-13 08:18:32 -04:00
Brad King 49e1fdaf0e Merge topic 'doc-preset-example-v3' into release-3.21
2114d717a0 Help: Fix preset example cmakeMinimumRequired

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6333
2021-07-13 08:17:30 -04:00