summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-lwyu-ar' into release-3.21Brad King2021-08-061-1/+4
|\ | | | | | | | | | | | | 93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6418
| * Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static librariesĐoàn Trần Công Danh2021-08-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | In commit d7159f9591, (Ninja: Fix LINK_WHAT_YOU_USE link flag placement, 2021-06-24), we fixed usage of -Wl,--no-as-needed to override -Wl,--as-needed from LDFLAGS. However, that change also passes -Wl,--no-as-needed to `ar`, which is incorrect flag for `ar`. Let's check the target type before passing down the flags. Fixes: #22487
* | Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into ↵Brad King2021-08-031-2/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | release-3.21 213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6421
| * | add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILERMarc Chevrier2021-08-011-2/+20
| | | | | | | | | | | | Fixes: #22486
* | | VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE librariesBrad King2021-07-291-0/+3
|/ / | | | | | | | | | | | | | | | | | | Since commit 4391913133 (Add INTERFACE libraries to generated buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1), the VS generator may process INTERFACE libraries. Avoid code paths in the generator that process include directories because they should not be used by INTERFACE libraries since they do not compile anything. Fixes: #22494
* | Merge topic 'cuda_separable_clang_make' into release-3.21Brad King2021-07-292-24/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-291-10/+14
| |/ | | | | | | | | | | | | | | 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-291-4/+2
|\ \ | | | | | | | | | | | | | | | | | | 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-281-4/+2
| |/ | | | | | | | | | | | | | | 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
* | CMakePresets: Check presets with their own file versionKyle Edwards2021-07-271-5/+5
|/ | | | | | | | | 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 branch 'upstream-KWSys' into update-kwsysBrad King2021-07-262-4/+6
| | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-07-26 (d5fd6ca2)
* Merge topic 'autouic-header-depends' into release-3.21Brad King2021-07-2610-81/+119
|\ | | | | | | | | | | | | 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-2310-81/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'nmc-target-objects' into release-3.21Brad King2021-07-231-4/+5
|\ \ | |/ |/| | | | | | | | | | | 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-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'message-color' into release-3.21Brad King2021-07-211-0/+11
|\ \ | | | | | | | | | | | | | | | | | | 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-201-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'toolchain-CMP0126' into release-3.21Brad King2021-07-211-0/+7
|\ \ | |/ |/| | | | | | | | | 144be54dd3 try_compile: Propagate CMP0126 to the generated test project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6366
| * try_compile: Propagate CMP0126 to the generated test projectBrad King2021-07-201-0/+7
| | | | | | | | | | Set policy CMP0126 to the value used in the calling project. It may affect toolchain file behavior.
* | AUTOUIC: Fix cyclic dependency between generated UI headers and timestampAlexey Edelev2021-07-191-6/+14
|/ | | | | | | | | | | | Once the generated UI headers are created by UIC they also are involved into processing in next run on ninja. Autogen adds `ui_*.h` files to the deps file `ui_*.h` and this cause timestamp start depend on `ui_*.h`. Meanwhile `ui_*.h` depend on timestamp because of the explicit rules added by commit 1265c65b33 (AUTOUIC: Collect ui header files for Ninja generator, 2021-02-18, v3.21.0-rc1~600^2). Avoid adding `ui_*.h` to deps file at second ninja run. Fixes: #16776
* Merge topic 'cmake-presets-no-binary-dir-no-s' into release-3.21Brad King2021-07-191-4/+6
|\ | | | | | | | | | | | | aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6358
| * CMakePresets.json: Fix expansion issue with empty binaryDirKyle Edwards2021-07-161-4/+6
| | | | | | | | | | | | | | | | When resolving binaryDir into a full path from a relative path, we forgot to check if binaryDir is altogether empty, causing empty binaryDir's to resolve to the source directory. Fix this. Fixes: #22434
* | VS: Update Visual Studio 17 2022 generator for Preview 2Brad King2021-07-151-2/+1
|/ | | | | | In particular, update to toolset `v143`. Fixes: #22339
* CMake 3.21.0v3.21.0Brad King2021-07-141-1/+1
|
* Help: Clarify 'cmake --build' signature alternativesBrad King2021-07-131-1/+4
| | | | | | | | | | | | | | | | Documentation added by * commit 4f4f2028b8 (Help: Add documentation for buildPresets and testPresets, 2021-01-13, v3.20.0-rc1~51^2~7) * commit 676ecf0d37 (cmake-presets: Add build and test presets, 2020-12-14, v3.20.0-rc1~51^2~6) used square brackets in the `cmake --build` signature to indicate non-optional alternatives, which is not a typical convention. A common convention is to use parentheses instead, but in this case it is probably clearer to list the two signatures separately. Fixes: #22413
* file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependenciesKyle Edwards2021-07-124-2/+65
| | | | Fixes: #22106
* CMake 3.21.0-rc3v3.21.0-rc3Brad King2021-07-081-1/+1
|
* Merge topic 'cmake-presets-list-no-generator' into release-3.21Brad King2021-07-071-0/+3
|\ | | | | | | | | | | | | d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6314
| * CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-061-0/+3
| | | | | | | | Fixes: #22389
* | Merge topic 'xcode13-old-buildsystem' into release-3.21Brad King2021-07-071-1/+5
|\ \ | |/ |/| | | | | | | | | 71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
| * Xcode: Ignore deprecated build systemGregor Jasny2021-07-061-1/+5
| | | | | | | | | | With Xcode 13 the key to suppress the check has changed. Tested with Xcode 12.5 and 13.0-beta2.
* | Merge branch 'backport-3.20-makefile-normalize-depfile'Brad King2021-07-023-6/+17
|\ \ | |/ |/|
| * Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
| * CMake 3.20.5v3.20.5Brad King2021-06-211-1/+1
| |
| * Merge topic 'fix-flow-control-override' into release-3.20Brad King2021-06-173-8/+17
| |\ | | | | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| * | VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| * | cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+19
| | | | | | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| * | cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-4/+6
| | |
* | | CMake 3.21.0-rc2v3.21.0-rc2Brad King2021-06-301-1/+1
| | |
* | | Merge topic 'CMP0126-WARNING' into release-3.21Brad King2021-06-302-5/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| * | | CMP0126: Add control for warningsMarc Chevrier2021-06-292-5/+22
| | | | | | | | | | | | | | | | Fixes: #22353
* | | | Merge topic 'vs-ARM64EC' into release-3.21Brad King2021-06-301-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
| * | | | VS: Add ARM64EC to supported platforms for VS 16 and 17Brad King2021-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4ea3a88625 (MSVC: Add support for targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2) the `ARM64EC` platform was accidentally added to the list for VS 15 (2017) instead of VS 16 (2019). Its omission from the list of platforms was then repeated for VS 17 (2022). Issue: #21724
* | | | | target_link_libraries: Restore transitive out-of-dir linkingBrad King2021-06-292-7/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7f506b95a7 (cmGeneratorTarget: Refactor link item lookup, 2021-05-26, v3.21.0-rc1~103^2~4) accidentally dropped the persistent lookup scope tracking across multiple items that was added by commit f0e67da061 (target_link_libraries: Fix out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2). This broke a transitive out-of-dir linking case not covered by our test suite. Restore the scope tracking and add a test case. Fixes: #22363
* | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-06-283-4/+23
|/ / / | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-06-28 (0648cb1a)
generated by cgit v0.12 at 2025-01-22 01:10:28 (GMT)