summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'objlib-transitive-deps'Brad King2020-03-058-15/+71
|\ | | | | | | | | | | | | | | a833aa1167 Fix dependencies on targets linked through object libraries 3b3de0fd17 Tests: Extend ObjectLibrary test with case for object lib dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4427
| * Fix dependencies on targets linked through object librariesBrad King2020-03-044-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an object library is used via `target_link_libraries`, any targets listed in the object library's `INTERFACE_LINK_LIBRARIES` closure should become direct dependencies of the consuming target. However, these were accidentally left out by `cmComputeTargetDepends::CollectTargetDepends` because object libraries are encountered through external object sources first and then added to the `emitted` set which blocks them from being processed as link dependencies. This was not noticed by the test case in commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) because the relevant dependency appears transitively through the object library target itself. Re-order the logic to process link dependencies first, and then external object sources. That way object libraries used via `target_link_libraries` will be treated as such by dependency analysis. This also adds missing backtrace information for object libraries used via `target_link_libraries`. The missing information was mentioned in a FIXME comment in the RunCMake.FileAPI test added by commit ea0a060168 (fileapi: Add test for codemodel v2, 2018-11-09, v3.14.0-rc1~257^2~7). That comment itself was dropped by commit a0de350e2f (FileAPI test: Break gen_check_targets() into JSON files, 2020-02-07), but we can now update the corresponding location in the `.json` files to have the now-expected backtrace information. Fixes: #20421
| * Tests: Extend ObjectLibrary test with case for object lib dependenciesBrad King2020-03-045-0/+24
| | | | | | | | | | | | Add the test case from commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) to the main ObjectLibrary test.
* | Merge branch 'release-3.17'Brad King2020-03-050-0/+0
|\ \
| * \ Merge topic 'ninja-multi-custom-command-deps' into release-3.17Brad King2020-03-054-7/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
* | \ \ Merge topic 'ninja-multi-custom-command-deps'Brad King2020-03-054-7/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
| * | | Ninja Multi-Config: Don't build target dependencies for custom commandsKyle Edwards2020-03-034-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If cross-config mode is used, and a target depends on another target as well as a custom command, we don't want the custom command to also depend on the depended target, as that would build targets unnecessarily. Fix this behavior.
* | | | Merge topic 'update-kwsys'Brad King2020-03-0519-967/+998
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e6b07f5ff Merge branch 'upstream-KWSys' into update-kwsys ec33e3600c KWSys 2020-03-04 (6af2e592) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4424
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-03-0419-967/+998
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-03-04 (6af2e592)
| | * | | | KWSys 2020-03-04 (6af2e592)KWSys Upstream2020-03-0419-967/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 6af2e59217a7e10ed507da564a1445b60ac2a095 (master). Upstream Shortlog ----------------- Hans Johnson (17): 81d1e737 STYLE: Use modern path naming 28b8e6c2 STYLE: Convert CMake-language commands to lower case 6ce3d69a DOC: Update documentation for modern add_subdirectory. 8a7fe7ac STYLE: Remove redundant void argument lists 1c3e193d COMP: Use nullptr instead of 0 or NULL 2a4c1252 STYLE: Replace integer literals which are cast to bool. 0fe7214d STYLE: Make prototype match definition names 3b30d0ff STYLE: Make prototype match definition names 691d5612 PERF: readability container size empty 7be4043f STYLE: Prefer c++11 'using' to 'typedef' acc916ed COMP: Prefer const pointer when value does not change 4c7f64eb COMP: Prefer const member functions d07092a0 STYLE: Use default member initialization 6d20e7c9 STYLE: Prefer = default to explicitly trivial implementations 91429382 PERF: emplace_back method results in potentially more efficient code cc8fc323 STYLE: Use auto for variable type matches the type of the initializer 6621b069 STYLE: Use range-based loops from C++11 Julien Schueller (1): a1a261ac CMake: Fix psapi lib name on case-sensitive fs
* | | | | | Merge topic 'findx11-improvement'Brad King2020-03-052-0/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77802aab97 FindX11: Find additional libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4101
| * | | | | | FindX11: Find additional librariesZsolt Parragi2020-03-042-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, FindLibrary(X11) learns about the following libraries: * xcb * X11-xcb * xcb-icccm * xcb-xkb * xkbcommon * xkbcommon-X11
* | | | | | | CMake Nightly Date StampKitware Robot2020-03-051-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.16'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | CMake 3.16.5v3.16.5Brad King2020-03-041-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.16'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'doc-rel-3.16-updates' into release-3.16Brad King2020-03-041-0/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4425
* | \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge topic 'doc-rel-3.16-updates' into release-3.17Brad King2020-03-041-0/+26
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d25d8e9eef Help: Update CMake 3.16 release notes for 3.16.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4425
* | | | | | | | Merge topic 'doc-rel-3.16-updates'Brad King2020-03-041-0/+26
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d25d8e9eef Help: Update CMake 3.16 release notes for 3.16.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4425
| * | | | | | | Help: Update CMake 3.16 release notes for 3.16.5Brad King2020-02-271-0/+26
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.16' into release-3.17Brad King2020-03-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge topic 'FindOpenAL-updates'Brad King2020-03-041-48/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a67f0a4ac7 FindOpenAL: Move user-relevant comments into public documentation cf0ce977de FindOpenAL: Minor implementation cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4414
| * | | | | | | FindOpenAL: Move user-relevant comments into public documentationNguyễn Gia Phong2020-03-031-35/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, the role of frameworks in the search order can help users trying to use the ``OPENALDIR`` environment variable. Fixes: #20334
| * | | | | | | FindOpenAL: Minor implementation cleanupNguyễn Gia Phong2020-03-031-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use modern FPHSA signature. Indent search paths.
* | | | | | | | Merge topic 'msvc-librarian'Brad King2020-03-045-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55196a1440 MSVC: Use 'lib' instead of 'link /lib' to create static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4409
| * | | | | | | | MSVC: Use 'lib' instead of 'link /lib' to create static librariesFrancisco Facioni2020-03-035-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `link.exe /lib` is an undocumented flag and it just calls `lib.exe`. Also `link.exe` doesn't parse the `/lib` option correctly when in a response file.
* | | | | | | | | Merge topic 'update-librhash'Brad King2020-03-0424-660/+959
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cfadf3bc6 librhash: Fix -Wdocumentation warning about @param name 8d3770738c librhash: Update build within CMake for rhash 1.3.9 471ebc590e Merge branch 'upstream-librhash' into update-librhash 641cc0030c librhash 2019-12-14 (75716b45) 74f1a64572 librhash: Update import script to get rhash 1.3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4417
| * | | | | | | | | librhash: Fix -Wdocumentation warning about @param nameBrad King2020-03-031-1/+1
| | | | | | | | | |
| * | | | | | | | | librhash: Update build within CMake for rhash 1.3.9Brad King2020-03-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'upstream-librhash' into update-librhashBrad King2020-03-0222-657/+957
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-librhash: librhash 2019-12-14 (75716b45)
| | * | | | | | | | | librhash 2019-12-14 (75716b45)librhash upstream2020-03-0222-755/+946
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/rhash/rhash.git at commit 75716b45c21416c98c0ab2e3c2735b150e7afb03 (v1.3.9).
| * | | | | | | | | | librhash: Update import script to get rhash 1.3.9Brad King2020-03-021-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FindPython-manage-SOABI-suffix' into release-3.17Brad King2020-03-046-14/+52
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4420
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'FindPython-manage-SOABI-suffix'Brad King2020-03-046-14/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4420
| * | | | | | | | | | | FindPython: python_add_library can now manage SOABI suffix.Marc Chevrier2020-03-036-14/+52
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20408
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'llvm-rc-defines-not-flags' into release-3.17Brad King2020-03-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee70c5de4d llvm-rc: Forward DEFINES instead of FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4419
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'llvm-rc-defines-not-flags'Brad King2020-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee70c5de4d llvm-rc: Forward DEFINES instead of FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4419
| * | | | | | | | | | | llvm-rc: Forward DEFINES instead of FLAGSThomas Bernard2020-03-031-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) we pass the full target `<FLAGS>` to the llvm-rc resource compiler, but we should pass only `<DEFINES>`. Fixes: #20414
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'ninja-multi-spurious-unused-variables' into release-3.17Brad King2020-03-043-2/+16
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b799f80e3 Ninja Multi-Config: Fix spurious unused variable warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4421
* | | | | | | | | | | Merge topic 'ninja-multi-spurious-unused-variables'Brad King2020-03-043-2/+16
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b799f80e3 Ninja Multi-Config: Fix spurious unused variable warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4421
| * | | | | | | | | Ninja Multi-Config: Fix spurious unused variable warningKyle Edwards2020-03-033-2/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20381
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-03-041-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cmake_command-eval'Brad King2020-03-0324-37/+183
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 598b676b5e cmake_command: Add command to EVAL a CMake script as a string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4408
| * | | | | | | | | cmake_command: Add command to EVAL a CMake script as a stringCristian Adam2020-03-0324-37/+183
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cmGeneratedFileStream-resource-leak'Brad King2020-03-031-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59530d9dec cmGeneratedFileStream: File resource leak if oldname not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4415
generated by cgit v0.12 at 2025-08-25 15:04:58 (GMT)