summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate Visual Studio 10 2010 generatorBrad King2021-07-2910-2/+53
| | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\
| * Merge topic 'haiku-platform' into release-3.21Brad King2021-07-291-5/+0
| |\ | | | | | | | | | | | | | | | | | | a1261ce917 Platform/Haiku: Remove the include-once behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6401
* | \ Merge topic 'haiku-platform'Brad King2021-07-291-5/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | a1261ce917 Platform/Haiku: Remove the include-once behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6401
| * | Platform/Haiku: Remove the include-once behaviorJessica Hamilton2021-07-291-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'cuda_separable_clang_make' into release-3.21Brad King2021-07-297-45/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ Merge topic 'cuda_separable_clang_make'Brad King2021-07-297-45/+56
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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
| * | | CUDA/Clang: Simplify --register-link-binaries logicroot2021-07-292-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | CUDA/Clang: Fix separable compilation in non-root directories with Makefilesroot2021-07-296-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'release-3.21'Brad King2021-07-290-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ctest-test-changing-labels' into release-3.21Brad King2021-07-293-5/+21
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 26170ea306 CTest: Reset multi-options to persistent multi-options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6403
* | | | Merge topic 'ctest-test-changing-labels'Brad King2021-07-293-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' into ctest-test-changing-labelsKyle Edwards2021-07-28241-1213/+4704
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | CTest: Reset multi-options to persistent multi-optionsKyle Edwards2021-07-283-5/+21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'SCS_mp'Brad King2021-07-292-3/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 069a5c3188 FindLAPACK: SCSL also has LAPACK routines dbcc5eaa05 FindBLAS: Update SCSL library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6402
| * | | | FindLAPACK: SCSL also has LAPACK routinesIgor S. Gerasimov2021-07-281-0/+24
| | | | |
| * | | | FindBLAS: Update SCSL libraryIgor S. Gerasimov2021-07-281-3/+11
| | | | |
* | | | | Merge topic 'FindBLAS-LAPACK-IBM-ESSL'Brad King2021-07-292-4/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindLAPACK: IBM ESSL 6.1 also has LAPACK routinesIgor S. Gerasimov2021-07-281-0/+24
| | | | | |
| * | | | | FindBLAS: Add possibility to find OMP parallelized version of ESSLIgor S. Gerasimov2021-07-271-3/+11
| | | | | |
| * | | | | FindBLAS: IBM ESSL 6.1 does not required BLAS libIgor S. Gerasimov2021-07-271-2/+2
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-07-291-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release-3.21'Brad King2021-07-280-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'cmake-presets-v2-inherit-v3-optional' into release-3.21Brad King2021-07-285-5/+25
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 3e42bf3e05 CMakePresets: Check presets with their own file version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6398
* | | | | Merge topic 'cmake-presets-v2-inherit-v3-optional'Brad King2021-07-285-5/+25
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | 3e42bf3e05 CMakePresets: Check presets with their own file version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6398
| * | | CMakePresets: Check presets with their own file versionKyle Edwards2021-07-275-5/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | CMake Nightly Date StampKitware Robot2021-07-281-1/+1
| |/ |/|
* | Merge topic 'FindBLAS-eml'Brad King2021-07-271-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | FindBLAS: use unset instead of set for empty variablesIgor S. Gerasimov2021-07-271-2/+2
| | |
| * | FindBLAS: Fix regression in finding EML_mt after recent refactoringIgor S. Gerasimov2021-07-271-1/+1
| | | | | | | | | | | | | | | Fix a variable referenced missed by commit 76487b04b1 (Find{BLAS,LAPACK}: clean variables, 2021-07-13).
* | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.21.1v3.21.1Brad King2021-07-271-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
|\ \ \ | |/ /
| * | Merge topic 'FindXCTest-xcode-12.5' into release-3.21Brad King2021-07-274-6/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6379
* | \ \ Merge topic 'FindXCTest-xcode-12.5'Brad King2021-07-274-6/+35
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 0b5301a778 FindXCTest: Fix output directory for test bundle with Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6379
| * | | FindXCTest: Fix output directory for test bundle with Xcode 12.5Yauheni Khnykin2021-07-264-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'disable-exec-info' into release-3.21Brad King2021-07-271-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa4c30182b Add option to explicitly avoid using execinfo for backtraces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6386
* | \ \ \ Merge topic 'disable-exec-info'Brad King2021-07-271-0/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | aa4c30182b Add option to explicitly avoid using execinfo for backtraces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6386
| * | | | Add option to explicitly avoid using execinfo for backtracesĐoàn Trần Công Danh2021-07-261-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'vs-flag-FS' into release-3.21Brad King2021-07-272-56/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ Merge topic 'vs-flag-FS'Brad King2021-07-272-56/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | VS: Remove C++ module CompileAs flag table entries for v142 and v143Brad King2021-07-262-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | VS: Remove cl /FS entry from flag table for v142 and v143Brad King2021-07-262-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ForceSynchronousPDBWrites` entry in a `.vcxproj` file does not actually cause the `/FS` flag to be added to the command line. Fixes: #22476
* | | | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'test-compile-options-none' into release-3.21Brad King2021-07-271-0/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6385
* | | | | Merge topic 'test-compile-options-none'Brad King2021-07-271-0/+4
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | 91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6385
| * | | Tests/CompileOptions: allow CMAKE_BUILD_TYPE=NoneĐoàn Trần Công Danh2021-07-261-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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