summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEMCraig Scott2021-07-311-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'doc-presets-toolchain-file' into release-3.21Craig Scott2021-08-021-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6417
| * | | | | Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILECraig Scott2021-07-311-2/+3
|/ / / / /
* | | | | 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
| * | | | | 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 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
| * | | | | 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 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
| * | | | 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 '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
| * | | 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 3.21.1v3.21.1Brad King2021-07-271-1/+1
| | |
* | | 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
| * | | 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 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
| * | | | 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 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
| * | | | 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 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
| * | | | 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
* | | | Merge topic 'update-kwsys' into release-3.21Brad 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 branch 'upstream-KWSys' into update-kwsysBrad King2021-07-262-4/+6
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-07-26 (d5fd6ca2)
| * | | KWSys 2021-07-26 (d5fd6ca2)KWSys Upstream2021-07-262-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'doc-custom-command-depfiles' into release-3.21Brad King2021-07-261-18/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6e5743d0e Help: Clarify and correct wording around DEPFILE option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6387
| * | | | Help: Clarify and correct wording around DEPFILE optionCraig Scott2021-07-241-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous wording contradicted itself regarding whether Visual Studio generators were supported, and about when generator expressions could be used. Restructure the paragraphs and max it clearer what support was added in which CMake versions.
* | | | | Merge topic 'ninja-multi-test-fix' into release-3.21Brad 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
| * | | | | Tests: Clean up Ninja Multi-Config test from cb777ddKyle Edwards2021-07-2318-6/+127
| | | | | |
* | | | | | Merge topic 'autouic-header-depends' into release-3.21Brad 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
| * | | | | | AUTOUIC: Fix generating of dependency rules for UI header filesAlexey Edelev2021-07-2315-83/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We could not rely on .ui files when generating the ninja rules for the generated UI header files. .ui files might be added to the target sources but never processed by AUTOUIC afterward, since UI header files are never included in a source code. Instead of adding dependency rules based on the .ui files, this approach scans non-generated source files for includes of the UI header files, as AUTOUIC does. This gives the consistent set of UI header files at configure time, that could be used to generate byproducts rules for the AUTOUIC. Also, the path to the generated UI header file depends not on the .ui file location but on the include line is used in source files. Fixes: #16776
* | | | | | | Merge topic 'autogen-deps' into release-3.21Brad King2021-07-261-5/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bda03370d AutoGen: Fix needless compilation of mocs_compilation.cpp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6381
| * | | | | | | AutoGen: Fix needless compilation of mocs_compilation.cppJoerg Bornemann2021-07-231-5/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an AUTOMOC'ed target foo, when depfiles are used, there are the following dependencies: foo_autogen -> foo_autogen/timestamp foo_autogen/mocs_compilation.cpp -> foo_autogen/timestamp The first is used to trigger AUTOGEN. The second erroneously triggers a recompilation of mocs_compilation.cpp when any source file of target foo is touched. Remove the latter dependency and replace it with an order-only dependency from foo_autogen/mocs_compilation.cpp to foo_autogen_timestamp_deps. That is achieved by making mocs_compilation.cpp or its per-configuration variants byproduct(s) of the timestamp file. Fixes: #22338
* | | | | | | Merge topic 'doc-ctest-output' into release-3.21Craig 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
| * | | | | | Help: Add cross-references between test output size ctest variablesCraig Scott2021-07-262-0/+6
| | | | | | |
| * | | | | | Help: Improve wording and cross-referencing for ctest JUnit outputCraig Scott2021-07-252-5/+7
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'gnu_c23' into release-3.21Brad King2021-07-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d61bc4241d GNU: Correct C23 flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6376
| * | | | | | GNU: Correct C23 flagsRaul Tambre2021-07-211-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-final forms aren't supported yet, unlike C++23. Seems I might've gotten confused due to that when I added these. Fixes #22453.
* | | | | | Merge topic 'nmc-target-objects' into release-3.21Brad 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
| * | | | | | Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configsBrad King2021-07-218-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2ae72ef74b (Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES, 2021-05-26, v3.21.0-rc1~126^2) the TARGET_OBJECTS genex, when referenced for linking, is now evaluated with EvaluateForBuildsystem enabled. This causes the object file paths to be computed with a buildsystem-specific placeholder for the configuration. This is normally fine because the placeholder will be evaluated by the native buildsystem tool using the proper configuration. However, the Ninja Multi-Config generator's `${CONFIGURATION}` placeholder may not have the correct value for cross-config object files. Switch back to using the per-config location of each object file for this generator. Fixes: #22436
| * | | | | | cmGeneratorExpressionNode: Factor out local variable for global generatorBrad King2021-07-201-3/+4
| | | | | | |
* | | | | | | Merge topic 'enable_language-CMP0126' into release-3.21Brad 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
| * | | | | | Swift: Update test case to try CMP0126 NEW behaviorBrad King2021-07-211-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `SwiftOnly` test to cover the fix in commit 3ddd7f3576 (enable_language: Fix test for working compiler with CMP0126 NEW behavior, 2021-07-15), as that commit did for the `CSharpOnly` test. Fixes: #22451
* | | | | | Merge topic 'iar-binutils' into release-3.21Brad King2021-07-233-86/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b9bfe738c IAR: Moved search logic to BinUtils. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6372
| * | | | | IAR: Moved search logic to BinUtils.Jean-Marc Hengen2021-07-233-86/+54
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search logic for the IAR linker, librarian and related tools is moved from `Modules/Compiler/IAR-FindBinUtils.cmake` to `Modules/CMakeFindBinUtils.cmake` by introducing an new elseif block for the IAR toolchain. The search logic was refactored to omit repeating itself. Fixes: #22425
* | | | | Merge topic 'message-color' into release-3.21Brad King2021-07-215-0/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7a8c9c811 cmMessenger: Revert to non-color messages on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6369
| * | | | | cmMessenger: Revert to non-color messages on WindowsBrad King2021-07-205-0/+26
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0a0a0f8a74 (cmMessenger: Color messages to terminal by type, 2021-05-18, v3.21.0-rc1~146^2) the message output no longer goes through our custom streambuf on Windows that converts output encoding. This can cause messages to be printed with the wrong encoding in a Windows Console. It also causes messages to have a mix of LF and CRLF newlines because `stderr` converts LF to CRLF but our custom streambuf does not. Revert to using just `cerr` for messages on Windows. Another approach will be needed to achieve color output on Windows later. Fixes: #22444
* | | | | Merge topic 'CMakeDependentOption-revert-parens' into release-3.21Brad King2021-07-215-12/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6368
| * | | | | CMakeDependentOption: Revert "Allow parentheses in the depends string"Brad King2021-07-205-12/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 0665d9092e (CMakeDependentOption: Allow parentheses in the depends string, 2021-06-13, v3.21.0-rc1~32^2). It broke existing use cases with parentheses in regular expressions. Also add a test for this. Fixes: #22447
* | | | | Merge topic 'toolchain-CMP0126' into release-3.21Brad King2021-07-2112-0/+29
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 144be54dd3 try_compile: Propagate CMP0126 to the generated test project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6366
generated by cgit v0.12 at 2025-01-26 14:58:34 (GMT)