mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,170 Commits 2 Branches 393 Tags
f4c194398d079ab5be3e693eae73774431d232f2
Commit Graph

54170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Grund
f4c194398d IRSL: Avoid duplication of Intel redist lib folder paths 2021-08-02 15:34:19 -04:00
Alexander Grund
2adc45c7f6 IRSL: Fix check of path to Intel redistdir 
Fix a cut-n-paste error from commit fd4406f33e (IRSL: Add Intel compiler
support, 2017-08-16, v3.10.0-rc1~187^2).  Make the checked and used
paths match.
 2021-08-02 15:34:09 -04:00
Kitware Robot
8e77f495b5 CMake Nightly Date Stamp 2021-07-30 00:01:09 -04:00
Brad King
9251205512 Merge branch 'release-3.21' 2021-07-29 08:46:48 -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
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
5f99139836 Merge branch 'release-3.21' 2021-07-29 08:45:40 -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
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
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
Brad King
b880867e5a Merge topic 'cmake-presets-v2-inherit-v3-optional' into release-3.21 
3e42bf3e05 CMakePresets: Check presets with their own file version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6398
 2021-07-28 09:14:39 -04:00
Igor S. Gerasimov
069a5c3188 FindLAPACK: SCSL also has LAPACK routines 2021-07-28 16:01:14 +03:00
Igor S. Gerasimov
dbcc5eaa05 FindBLAS: Update SCSL library 2021-07-28 15:56:34 +03:00
Kitware Robot
986caf9b86 CMake Nightly Date Stamp 2021-07-28 00:01:13 -04:00
Igor S. Gerasimov
ccb85f8943 FindBLAS: Add possibility to find OMP parallelized version of ESSL 2021-07-27 20:22:30 +03:00
Igor S. Gerasimov
73e452eb98 FindBLAS: IBM ESSL 6.1 does not required BLAS lib 2021-07-27 20:15:10 +03:00
Kyle Edwards
3e42bf3e05 CMakePresets: Check presets with their own file version 
06e6981 added support for optional binaryDir and generator, but
use the dependent preset's file version instead of the current
preset's file version. Check presets with their own file version
instead of their dependent's file version.

Fixes: #22428
 2021-07-27 11:45:57 -04:00
Brad King
ea28d28a61 Merge topic 'FindBLAS-eml' 
a7f6e5dbf9 FindBLAS: use unset instead of set for empty variables
92edd7376b FindBLAS: Fix regression in finding EML_mt after recent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6397
 2021-07-27 11:22:35 -04:00
Igor S. Gerasimov
a7f6e5dbf9 FindBLAS: use unset instead of set for empty variables 2021-07-27 10:53:54 -04:00
Igor S. Gerasimov
92edd7376b FindBLAS: Fix regression in finding EML_mt after recent refactoring 
Fix a variable referenced missed by commit 76487b04b1
(Find{BLAS,LAPACK}: clean variables, 2021-07-13).
 2021-07-27 10:53:25 -04:00
Brad King
6643c44432 Merge branch 'release-3.21' 2021-07-27 10:15:19 -04:00
Brad King
f7cf69e34a CMake 3.21.1 v3.21.1 2021-07-27 09:29:13 -04:00
Brad King
9cd719b8f3 Merge branch 'release-3.21' 2021-07-27 09:11:33 -04:00
Brad King
418313a7d6 Merge topic 'FindXCTest-xcode-12.5' 
0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6379
 2021-07-27 09:11:33 -04:00
Brad King
675c130091 Merge topic 'FindXCTest-xcode-12.5' into release-3.21 
0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6379
 2021-07-27 09:11:32 -04:00
Brad King
c38d009f71 Merge branch 'release-3.21' 2021-07-27 09:10:31 -04:00
Brad King
f90e100b73 Merge topic 'disable-exec-info' into release-3.21 
aa4c30182b Add option to explicitly avoid using execinfo for backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6386
 2021-07-27 09:10:31 -04:00
Brad King
00199e96ef Merge topic 'disable-exec-info' 
aa4c30182b Add option to explicitly avoid using execinfo for backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6386
 2021-07-27 09:10:31 -04:00
Brad King
87f7aecc27 Merge branch 'release-3.21' 2021-07-27 09:09:32 -04:00
Brad King
ec35b3b512 Merge topic 'vs-flag-FS' 
937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143
8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Niels Dekker <niels_dekker_address_until_2024@xs4all.nl>
Merge-request: !6390
 2021-07-27 09:09:32 -04:00
Brad King
f90d995e1a Merge topic 'vs-flag-FS' into release-3.21 
937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143
8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Niels Dekker <niels_dekker_address_until_2024@xs4all.nl>
Merge-request: !6390
 2021-07-27 09:09:31 -04:00
Brad King
d1c592109d Merge branch 'release-3.21' 2021-07-27 09:08:35 -04:00
Brad King
e423f530ba Merge topic 'test-compile-options-none' 
91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6385
 2021-07-27 09:08:35 -04:00
Brad King
a5f655bc0d Merge topic 'test-compile-options-none' into release-3.21 
91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6385
 2021-07-27 09:08:34 -04:00
Kitware Robot
c15bb6f8b8 CMake Nightly Date Stamp 2021-07-27 00:01:08 -04:00
Yauheni Khnykin
0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5 
The fix from commit eafe740ead (FindXCTest: Fix output directory for
test bundle with new build system, 2021-02-09, v3.19.5~5^2) is not
necessary with Xcode 12.5, which seems to have changed/fixed the
behaviour again.

Fixes: #22462
 2021-07-26 13:31:10 -04:00
Đoàn Trần Công Danh
aa4c30182b Add option to explicitly avoid using execinfo for backtraces 
backtrace(3) from libexecinfo in musl will run into crash [1].

Provide an option to disable it explicitly even if libexecinfo is
present.

1: https://www.openwall.com/lists/musl/2021/07/17/1
 2021-07-26 12:14:02 -04:00