summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ci-use-3.21.0'Brad King2021-07-152-6/+6
|\ | | | | | | | | | | | | 79e139e3d3 ci: use CMake 3.21.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6349
| * ci: use CMake 3.21.0Ben Boeckel2021-07-142-6/+6
| |
* | Merge topic 'findblaslapack-cray'Brad King2021-07-152-26/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Find{BLAS,LAPACK}: clean variablesSeth R Johnson2021-07-142-25/+31
| | |
| * | Find{BLAS,LAPACK}: improve found message on CraySeth R Johnson2021-07-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | CMake Nightly Date StampKitware Robot2021-07-151-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-140-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.21.0v3.21.0Brad King2021-07-141-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-140-0/+0
|\ \ \ | |/ /
| * | Merge topic 'armlink_armar_detection' into release-3.21Brad King2021-07-142-11/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 509ef50a06 ARMClang: Fix regression in check for working compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6346
* | \ \ Merge topic 'armlink_armar_detection'Brad King2021-07-142-11/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 509ef50a06 ARMClang: Fix regression in check for working compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6346
| * | | ARMClang: Fix regression in check for working compilerLingkai Dong2021-07-142-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | Merge topic 'FindPkgConfig-LIBRARY_PATH'Brad King2021-07-144-0/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36979f5b43 FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6345
| * | | | FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environmentBrad King2021-07-134-0/+48
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'cpack-deb-debuginfo'Brad King2021-07-145-205/+200
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Refactor: Drop redundand `std::endl` calls in the middle of outputAlex Turbov2021-07-131-36/+52
| | | | |
| * | | | Refactor: Use `cmStrToLong` instead of `std::strtol`Alex Turbov2021-07-131-18/+17
| | | | |
| * | | | Refactor: Avoid duplicate calls to `GetOption("GEN_DBGSYMDIR")`Alex Turbov2021-07-131-9/+11
| | | | |
| * | | | Refactor: Deduplicate code of `createDebPackages()`Alex Turbov2021-07-131-22/+19
| | | | | | | | | | | | | | | | | | | | Also, fix incorrect `retval` accumulation.
| * | | | CPack/DEB: dbgsym package not generated for non-component packagingAlex Turbov2021-07-135-70/+81
| | | | | | | | | | | | | | | | | | | | Fix: #19735
| * | | | Refactor: Extract packaged files finder into a functionAlex Turbov2021-07-131-45/+34
| | | | |
| * | | | Refactor: cmCPackDebGenerator::PackageComponents handle `else` firstAlex Turbov2021-07-131-27/+27
| | | | | | | | | | | | | | | | | | | | Also, return early to reduce nesting level of the function body.
| * | | | Refactor: Change return value to bool for private membersAlex Turbov2021-07-132-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | The `cmCPackDebGenerator::createDeb()` and `cmCPackDebGenerator::createDbgsymDDeb()` in fact have boolean return value.
| * | | | Refactor: Drop unnecessary `if` before `return`Alex Turbov2021-07-131-8/+2
| | | | |
| * | | | Refactor: Drop useless assignments of `retval` before returnAlex Turbov2021-07-131-4/+2
| |/ / /
* | | | Merge topic 'link-item-cleanup'Brad King2021-07-142-44/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmGeneratorTarget: Clarify logic recognizing explicit link interfaceBrad King2021-07-131-6/+6
| | | | |
| * | | | cmGeneratorTarget: Clarify cmLinkImplItem constructor callBrad King2021-07-131-1/+2
| | | | |
| * | | | cmGeneratorTarget: Clarify ExpandLinkItems local variable roleBrad King2021-07-131-4/+7
| | | | |
| * | | | cmGeneratorTarget: Simplify ExpandLinkItems signatureBrad King2021-07-132-35/+19
| |/ / /
* | | | Merge topic 'FindMPI-cray-interrogate'Brad King2021-07-141-1/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9fcbb06f2 FindMPI: Interrogate Cray compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6264
| * | | | FindMPI: Interrogate Cray compilerAxel Huebl2021-07-131-1/+49
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'release-3.21'Brad King2021-07-140-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'doc-cmake-build-signature' into release-3.21Brad King2021-07-1416-16/+20
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 161f1f42d6 Help: Clarify 'cmake --build' signature alternatives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6343
* | | | Merge topic 'doc-cmake-build-signature'Brad King2021-07-1416-16/+20
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 161f1f42d6 Help: Clarify 'cmake --build' signature alternatives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6343
| * | | Help: Clarify 'cmake --build' signature alternativesBrad King2021-07-1316-16/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | CMake Nightly Date StampKitware Robot2021-07-141-1/+1
| |/ |/|
* | Merge topic 'cpack-deb-lib-multiarch'Brad King2021-07-131-2/+4
|\ \ | | | | | | | | | | | | | | | | | | 68b961d361 CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6341
| * | CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirsAlex Turbov2021-07-121-2/+4
| | | | | | | | | | | | Fixes: #22411
* | | Merge topic 'ctest-environment-modifications'Brad King2021-07-1325-5/+341
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CTest: add an ENVIRONMENT_MODIFICATION propertyBen Boeckel2021-07-0924-3/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allows projects to modify environment variables at test time rather than trying to guess what the state should be based on what is present at configure time. Of particular interest is the ability to use a `PATH` present at test time while adding entries known to be necessary for the test itself. There are multiple operations provided to modify variables, including: - setting and unsetting - appending and prepending as: - strings - path lists - CMake lists Additionally, a `reset` action is provided to cancel any prior modifications to that particular variable in the case of incremental additions to the test property.
| * | | Help/prop_test/ENVIRONMENT: clarify the scope of the changesBen Boeckel2021-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The "restored" bit is an implementation detail as it could also be implemented by passing a crafted environment to `execve` or `CreateProcess` arguments. Instead, state that the environment changes only affects the test with the property set.
* | | | Merge topic 'state-project-kind'Brad King2021-07-137-51/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmake: Model normal and try-compile project kinds explicitlyBrad King2021-07-126-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Construct with the project kind instead of mutating state after construction.
| * | | | cmState: Construct with modeBrad King2021-07-124-19/+13
| | | | |
* | | | | Merge topic 'UseSWIG-dependencies-VS-generators'Brad King2021-07-133-8/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1bece92d5 UseSWIG: Use swig generated dependencies for Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6327
| * | | | | UseSWIG: Use swig generated dependencies for Visual StudioMarc Chevrier2021-07-093-8/+25
| | | | | |
* | | | | | Merge topic 'ctest-libuv-exe-network-path'Brad King2021-07-131-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 113cc4c684 libuv: Allow windows UNC path with forward slashes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6330
| * | | | | | libuv: Allow windows UNC path with forward slashesearnal2021-07-121-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix libuv issue 3159 in CMake while integration in upstream libuv is pending. Fixes: #22141
* | | | | | Merge topic 'vs-CMAKE_MSVCIDE_RUN_PATH'Brad King2021-07-137-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6334