mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 21:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,197 Commits 2 Branches 385 Tags
0660dc4dcfc1934757a5a7f0ddf5980fee2f8d1a
Commit Graph

54197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
0660dc4dcf Merge topic 'find_cudatoolkit_understand_nvhpc_math_library_location' 
d856aaa37d FindCUDAToolkit: Understand NVHPC versioned math library layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6405
 2021-08-02 15:09:43 -04:00
Brad King
0194918636 Merge topic 'ghs_generator_bashism_fix' 
172475b2c5 GHS: Remove bashism from custom command shell scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6409
 2021-08-02 15:08:49 -04:00
Brad King
00d2762fd5 Merge branch 'release-3.21' 2021-08-02 14:07:13 -04:00
Brad King
99d3e20999 Merge topic 'vs-iface-include-dirs' 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King
e9b8d6fdbc Merge topic 'vs-iface-include-dirs' into release-3.21 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King
9faefbc67c Merge branch 'release-3.21' 2021-08-02 14:05:34 -04:00
Brad King
d14a1ae859 Merge topic 'nvhpc-MD-flag' into release-3.21 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King
b65378878b Merge topic 'nvhpc-MD-flag' 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King
00535bab00 Merge topic 'autogen-ui-header-depends' into release-3.21 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Brad King
e382ef0e23 Merge branch 'release-3.21' 2021-08-02 14:04:08 -04:00
Brad King
bae8437895 Merge topic 'autogen-ui-header-depends' 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Marc Chevrier
519ce95584 Merge topic 'fix_stanardlevelcomputer_typo' 
8d5052fdc4 cmStandardLevelResolver: Fixed typo in struct name + clang-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6419
 2021-08-02 10:32:13 -04:00
Craig Scott
28ce8a932d Merge topic 'doc-dmg-filesystem' into release-3.21 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott
c62e1a4e51 Merge branch 'release-3.21' 2021-08-02 04:56:23 -04:00
Craig Scott
800abe1337 Merge topic 'doc-dmg-filesystem' 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott
6fb63e56df Merge topic 'doc-presets-toolchain-file' into release-3.21 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Craig Scott
fc1556c540 Merge branch 'release-3.21' 2021-08-02 04:54:49 -04:00
Craig Scott
bc44c32773 Merge topic 'doc-presets-toolchain-file' 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Kitware Robot
09217f2779 CMake Nightly Date Stamp 2021-08-02 00:01:15 -04:00
Kitware Robot
0a6415ea1f CMake Nightly Date Stamp 2021-08-01 00:02:11 -04:00
Jaak Ristioja
8d5052fdc4 cmStandardLevelResolver: Fixed typo in struct name + clang-format 2021-07-31 15:12:27 +03:00
Craig Scott
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE 2021-07-31 17:08:42 +10:00
Kitware Robot
16398b8130 CMake Nightly Date Stamp 2021-07-31 00:01:07 -04:00
Craig Scott
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM 2021-07-31 11:14:26 +10:00
Kitware Robot
8e77f495b5 CMake Nightly Date Stamp 2021-07-30 00:01:09 -04:00
Brad King
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries 
Since commit 4391913133 (Add INTERFACE libraries to generated
buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1), the
VS generator may process INTERFACE libraries.  Avoid code paths in the
generator that process include directories because they should not be
used by INTERFACE libraries since they do not compile anything.

Fixes: #22494
 2021-07-29 11:38:58 -04:00
Robert Maynard
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc 2021-07-29 10:43:54 -04:00
Brad King
9251205512 Merge branch 'release-3.21' 2021-07-29 08:46:48 -04:00
Brad King
516ac348c7 Merge topic 'haiku-platform' into release-3.21 
a1261ce917 Platform/Haiku: Remove the include-once behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6401
 2021-07-29 08:46:47 -04:00
Brad King
1d12ea35c6 Merge topic 'haiku-platform' 
a1261ce917 Platform/Haiku: Remove the include-once behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6401
 2021-07-29 08:46:47 -04:00
Brad King
0a959bb271 Merge topic 'cuda_separable_clang_make' into release-3.21 
3975678fcc CUDA/Clang: Simplify --register-link-binaries logic
0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6400
 2021-07-29 08:45:40 -04:00
Brad King
5f99139836 Merge branch 'release-3.21' 2021-07-29 08:45:40 -04:00
Brad King
6064c70469 Merge topic 'cuda_separable_clang_make' 
3975678fcc CUDA/Clang: Simplify --register-link-binaries logic
0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6400
 2021-07-29 08:45:40 -04:00
Brad King
0c028df0b4 Merge branch 'release-3.21' 2021-07-29 08:44:28 -04:00
Brad King
a8eabcc357 Merge topic 'ctest-test-changing-labels' 
d2515f77e1 Merge branch 'master' into ctest-test-changing-labels
26170ea306 CTest: Reset multi-options to persistent multi-options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6403
 2021-07-29 08:44:28 -04:00
Brad King
5f1afff9f7 Merge topic 'ctest-test-changing-labels' into release-3.21 
26170ea306 CTest: Reset multi-options to persistent multi-options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6403
 2021-07-29 08:44:27 -04:00
Jessica Hamilton
a1261ce917 Platform/Haiku: Remove the include-once behavior 
The behavior was added by commit 7ebc1cb2ff (Haiku: Several fixes to
platform module, 2013-10-05, v3.0.0-rc1~541^2~3), but was not explained
in its commit message.  No other platform modules do this.

The include-once behavior results in incorrect variables set in some
larger projects, e.g. .NET Core, particularly when cross-compiling,
`CMAKE_DL_LIBS` being one of these.  Remove it.
 2021-07-29 08:42:46 -04:00
Brad King
c2dd240f00 Merge topic 'SCS_mp' 
069a5c3188 FindLAPACK: SCSL also has LAPACK routines
dbcc5eaa05 FindBLAS: Update SCSL library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6402
 2021-07-29 08:41:13 -04:00
Brad King
272bbda602 Merge topic 'FindBLAS-LAPACK-IBM-ESSL' 
03913b12cb FindLAPACK: IBM ESSL 6.1 also has LAPACK routines
ccb85f8943 FindBLAS: Add possibility to find OMP parallelized version of ESSL
73e452eb98 FindBLAS: IBM ESSL 6.1 does not required BLAS lib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6399
 2021-07-29 08:40:00 -04:00
root
3975678fcc CUDA/Clang: Simplify --register-link-binaries logic 
Move the logic for appending cubin afterwards, so the check can simply be
empty().
With the Makefile generator the option is now at the front instead of being
intermixed with the actual bins.
 2021-07-29 13:19:37 +03:00
root
0b1cea66cd CUDA/Clang: Fix separable compilation in non-root directories with Makefiles 
Seems the relative paths were wrong basically all around such that only
compiling files in the top-level directory would work. I've modified
CudaOnly.SeparateCompilation to cover this.

Fixes #22482.
 2021-07-29 13:19:37 +03:00
Kitware Robot
824bab99e9 CMake Nightly Date Stamp 2021-07-29 00:01:09 -04:00
Lawrence A
172475b2c5 GHS: Remove bashism from custom command shell scripts 2021-07-28 19:13:14 +01:00
Robert Maynard
d856aaa37d FindCUDAToolkit: Understand NVHPC versioned math library layout 
The NVHPC packages bundle the CUDA math libraries in a sibling
directory (`math_libs`) instead of in with the rest of the
cuda libraries.

Depending on the NVHPC package the math_libs folder can have
versioned subdirectories, therefore we prefer finding the
same versions as the CUDA Toolkit and falling back to the
latest when not possible.
 2021-07-28 13:49:44 -04:00
Alexey Edelev
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp 
Follow up test for the commit 9cebdbec.
 2021-07-28 18:43:18 +02:00
Kyle Edwards
d2515f77e1 Merge branch 'master' into ctest-test-changing-labels 2021-07-28 09:59:23 -04:00
Kyle Edwards
26170ea306 CTest: Reset multi-options to persistent multi-options 
44ad3f0b added multi-options to CTest, but didn't reset them,
causing ctest_test() to fail if it was run multiple times with
different label arguments. Reset the multi-options.

Fixes: #22485
 2021-07-28 09:58:28 -04:00
Igor S. Gerasimov
03913b12cb FindLAPACK: IBM ESSL 6.1 also has LAPACK routines 2021-07-28 09:17:29 -04:00
Brad King
6efdd7e814 Merge branch 'release-3.21' 2021-07-28 09:14:40 -04:00
Brad King
309a9cec9e Merge topic 'cmake-presets-v2-inherit-v3-optional' 
3e42bf3e05 CMakePresets: Check presets with their own file version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6398
 2021-07-28 09:14:40 -04:00