summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ctest-test-changing-labelsKyle Edwards2021-07-28241-1213/+4704
|\
| * 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
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'release-3.21'Brad King2021-07-270-0/+0
| |\ \ \
| * \ \ \ 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
| * \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-270-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ 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
| * \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-270-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-270-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'release-3.21'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge topic 'update-kwsys'Brad King2021-07-262-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4977184128 Merge branch 'upstream-KWSys' into update-kwsys 7fc3f7001a KWSys 2021-07-26 (d5fd6ca2) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6391
| * \ \ \ \ \ \ \ \ \ \ \ Merge topic 'refactor-target-export'Brad King2021-07-2612-66/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8e19ed8f2 Refactor export file generator inteface 55e4753bbb Refactor cmTargetExport removing InterfaceIncludeDirecories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6370
| | * | | | | | | | | | | | Refactor export file generator intefaceEugene Shalygin2021-07-228-62/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace cmTargetExport with const cmGeneratorTarget to allow recursive processing of exported targets and their link dependencies.
| | * | | | | | | | | | | | Refactor cmTargetExport removing InterfaceIncludeDirecoriesEugene Shalygin2021-07-225-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of this property in the cmTargetExport struct, exporting targets is not uniform: top-level ones have to be dealt with via the cmTargetExport objects, while all linked ones are cmGeneratorTarget objects. Let's pass this additional includedirectories via a special target property making handling exported targets uniform.
| * | | | | | | | | | | | | Merge topic 'support_other_cuda_libdevice_locations'Brad King2021-07-261-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | CUDA: Extract nvvm libdevice location from compiler verbose outputRobert Maynard2021-07-221-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the CUDA installation the nvvm/libdevice folder can be in different locations. Since `nvcc` outputs the expected location use that when possible.
| * | | | | | | | | | | | | | Merge branch 'release-3.21'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'doc-custom-command-depfiles'Brad King2021-07-261-18/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6e5743d0e Help: Clarify and correct wording around DEPFILE option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6387
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'ninja-multi-test-fix'Brad King2021-07-2618-6/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08131e83bc Tests: Clean up Ninja Multi-Config test from cb777dd Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6383
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'autouic-header-depends'Brad King2021-07-2615-83/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5ec0e52f4 AUTOUIC: Fix generating of dependency rules for UI header files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6380
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'autogen-deps'Brad King2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bda03370d AutoGen: Fix needless compilation of mocs_compilation.cpp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6381
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Craig Scott2021-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'doc-ctest-output'Craig Scott2021-07-264-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba6d1947b6 Help: Add cross-references between test output size ctest variables cdde9e5a10 Help: Improve wording and cross-referencing for ctest JUnit output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6389
| * | | | | | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge topic 'FindPatch-typo'Brad King2021-07-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39a18aad07 FindPatch: Fix typo in find_program call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6373
| | * | | | | | | | | | | | | | | | | | | | | | | | FindPatch: Fix typo in find_program callFerenc Gerlits2021-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no `NAME` option. It should be `NAMES`. The call worked with `NAME` only due to old `find_program` signature compatibility. After this, the `find_program` call works even with PATHS removed (on non-Windows systems where this PATHS is not needed).
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'release-3.21'Brad King2021-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'gnu_c23'Brad King2021-07-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d61bc4241d GNU: Correct C23 flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6376
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'nmc-target-objects'Brad King2021-07-238-21/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb777dd81e Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configs 83c8272280 cmGeneratorExpressionNode: Factor out local variable for global generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6371
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'enable_language-CMP0126'Brad King2021-07-231-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 078ba4b2a4 Swift: Update test case to try CMP0126 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6375
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'iar-binutils'Brad King2021-07-233-86/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b9bfe738c IAR: Moved search logic to BinUtils. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6372
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |