mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,156 Commits 2 Branches 401 Tags
a8eabcc357fdd45fef403f6e64ce0eb0b03329eb
Commit Graph

54156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
Brad King 6c01bbe180 Merge branch 'release-3.21' 2021-07-26 12:10:24 -04:00
Brad King 0615aeffbf Merge topic 'update-kwsys' into release-3.21 
4977184128 Merge branch 'upstream-KWSys' into update-kwsys
7fc3f7001a KWSys 2021-07-26 (d5fd6ca2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6391
 2021-07-26 12:10:23 -04:00
Brad King 865e266a14 Merge topic 'update-kwsys' 
4977184128 Merge branch 'upstream-KWSys' into update-kwsys
7fc3f7001a KWSys 2021-07-26 (d5fd6ca2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6391
 2021-07-26 12:10:23 -04:00
Brad King 937f454fb9 VS: Remove C++ module CompileAs flag table entries for v142 and v143 
The `CompileAs` entry in a `.vcxproj` file with values:

* `CompileAsCppModule` for `-interface`
* `CompileAsCppModuleInternalPartition` for `-internalPartition`
* `CompileAsHeaderUnit` for `-exportHeader`

does not cause the corresponding flag to be added to the command line.
Drop the flag table entries so that the flags go to `AdditionalOptions`.

Fixes: #22477
 2021-07-26 10:49:26 -04:00
Brad King 8fb349a80e VS: Remove cl /FS entry from flag table for v142 and v143 
The `ForceSynchronousPDBWrites` entry in a `.vcxproj` file does not
actually cause the `/FS` flag to be added to the command line.

Fixes: #22476
 2021-07-26 10:45:09 -04:00
Brad King 4977184128 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-07-26 (d5fd6ca2)
 2021-07-26 10:17:18 -04:00
KWSys Upstream 7fc3f7001a KWSys 2021-07-26 (d5fd6ca2) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit d5fd6ca2ba5b4ca04d7ac346ceb87f7d2b0ad8aa (master).

Upstream Shortlog
-----------------

Dženan Zukić (1):
      7079df74 SystemTools: Fix GetOperatingSystemNameAndVersion empty string return

Đoàn Trần Công Danh (1):
      4e69b791 SystemInformation: Add option to explicitly avoid using execinfo
 2021-07-26 10:17:18 -04:00
Đoàn Trần Công Danh 91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None 
In the same spirit of commit ce1cadd35a, (Tests/ConfigSources: fix for
non main stream CMAKE_BUILD_TYPE, 2021-04-01).

Allow distributions' check to pass seemlessly.

Issue: #22470
 2021-07-26 09:50:26 -04:00
Brad King 0d987bbd88 Merge topic 'refactor-target-export' 
e8e19ed8f2 Refactor export file generator inteface
55e4753bbb Refactor cmTargetExport removing InterfaceIncludeDirecories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6370
 2021-07-26 09:44:15 -04:00
Brad King 60eecc1fa2 Merge topic 'support_other_cuda_libdevice_locations' 
125bbf07b1 CUDA: Extract nvvm libdevice location from compiler verbose output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6365
 2021-07-26 09:41:29 -04:00
Brad King 0079f24f45 Merge topic 'doc-custom-command-depfiles' into release-3.21 
f6e5743d0e Help: Clarify and correct wording around DEPFILE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6387
 2021-07-26 09:39:55 -04:00
Brad King cac4d5d923 Merge branch 'release-3.21' 2021-07-26 09:39:55 -04:00
Brad King 2cc59a80b8 Merge topic 'doc-custom-command-depfiles' 
f6e5743d0e Help: Clarify and correct wording around DEPFILE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6387
 2021-07-26 09:39:55 -04:00
Brad King 00a3889c19 Merge topic 'ninja-multi-test-fix' into release-3.21 
08131e83bc Tests: Clean up Ninja Multi-Config test from cb777dd

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6383
 2021-07-26 09:36:49 -04:00