summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests/CXXModules: test that objects depend on dependent modules json filesBen Boeckel2024-02-156-0/+55
|
* cmNinjaTargetGenerator: use `emplace_back` for scanning depsBen Boeckel2024-02-151-3/+5
|
* cxxmodules: depend on the modmap contentsBen Boeckel2024-02-151-1/+1
| | | | | | | If the modmap changes, we need to recompile. It is not just a file that needs to exist to compile. Fixes: #25511
* Tests/CXXModules: test that objects depend on their modmap filesBen Boeckel2024-02-156-0/+49
|
* Tests/CXXModules: support testing rebuild conditionsBen Boeckel2024-02-141-0/+13
|
* CMake 3.28.3v3.28.3Brad King2024-02-052-3/+3
|
* Merge topic 'restore-pch-with-unity' into release-3.28Brad King2024-02-056-30/+17
|\ | | | | | | | | | | | | | | | | | | | | | | 30829da506 Unity: Clarify source comments on unity build transformation 87bf1c6c33 Merge branch 'unity-after-compile-features' into restore-pch-with-unity df08c37a42 cmGlobalGenerator: Add unity/pch sources after computing compile features 004c3c3986 Tests: Add case covering PCH in a unity build Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !9215
| * Unity: Clarify source comments on unity build transformationBrad King2024-02-022-1/+3
| |
| * Merge branch 'unity-after-compile-features' into restore-pch-with-unityBrad King2024-02-025-29/+14
| |\ |/ / | | | | | | | | | | | | | | | | Replace commit 76b5383123 (cmGlobalGenerator: add unity sources after computing target compile features, 2024-01-01, v3.28.2~17^2~1) with an alternative change. This merge commit resolves conflicts such that future `git blame` calls will follow the second parent for the relevant lines and pretend the replaced commit never existed. Fixes: #25650
| * cmGlobalGenerator: Add unity/pch sources after computing compile featuresBrad King2024-02-022-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sources that will be scanned for C++ module dependencies need to be excluded from unity builds. We need to compute compile features in order to know which sources will be scanned. Unity build and PCH sources can be added afterward without changing the compile features. This re-implements commit 76b5383123 (cmGlobalGenerator: add unity sources after computing target compile features, 2024-01-01, v3.28.2~17^2~1) using a simpler approach that also preserves support for PCH with Unity builds. Issue: #25650 Co-authored-by: Ben Boeckel <ben.boeckel@kitware.com>
| * Tests: Add case covering PCH in a unity buildBrad King2024-02-023-0/+4
| | | | | | | | Issue: #25650
* | Merge topic 'update-zlib' into release-3.28Brad King2024-01-312-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 22a52526e2 Merge branch 'upstream-zlib' into update-zlib 6c2bed54f6 zlib 2022-10-12 (04f42cec) e868b19ed1 zlib: Fix 1.2.13 version and date notice Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9204
| * \ Merge branch 'upstream-zlib' into update-zlibBrad King2024-01-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | # By zlib upstream * upstream-zlib: zlib 2022-10-12 (04f42cec)
| | * | zlib 2022-10-12 (04f42cec)zlib upstream2024-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/madler/zlib.git at commit 04f42ceca40f73e2978b50e93806c2a18c1281fc (v1.2.13).
| * | | zlib: Fix 1.2.13 version and date noticeBrad King2024-01-301-2/+2
|/ / / | | | | | | | | | Issue: #25576
* | | CMake 3.28.2v3.28.2Brad King2024-01-292-4/+4
| | |
* | | Merge topic 'autogen-makefile-depfile' into release-3.28Brad King2024-01-297-2/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0bedb2170 Autogen: Forward dependencies when both Makefile and DEPFILE are used 4deb9c41b8 cmQtAutoGenInitializer: Improve Const-correctness Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9190
| * | | Autogen: Forward dependencies when both Makefile and DEPFILE are usedOrkun Tokdemir2024-01-287-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ebc9e448b3 (Autogen: Add depfile support for Makefiles, 2023-09-07, v3.28.0-rc1~101^2~1) CMake does not generate the correct dependency graph when both `Makefile` and `DEPFILE` are used. The build of `<target_name>_autogen_timestamp_deps` fails due to missing dependencies. To tackle that problem, forward target dependencies to both `<target_name>_autogen_timestamp_deps` and `<target_name>_autogen` instead of just `<target_name>_autogen`. Fixes: #25600
| * | | cmQtAutoGenInitializer: Improve Const-correctnessOrkun Tokdemir2024-01-261-1/+1
| | | |
* | | | Merge topic 'revert-FindFreetype-use-config' into release-3.28Brad King2024-01-261-98/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5725ae619 FindFreetype: Revert use of upstream freetype cmake package Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !9187
| * | | | FindFreetype: Revert use of upstream freetype cmake packageBrad King2024-01-251-98/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream freetype cmake package uses generator expressions and imported target to express its dependencies. That's fine on its own. However, our use of it since commit d83d925045 (FindFreetype: use `freetype-config.cmake` if available, 2023-09-06, v3.28.0-rc1~130^2) causes the `FREETYPE_LIBRARIES` result variable to reference those imported targets and create a package-level dependency for clients that did not exist previously. Revert that change for now, along with its follow-up fixes. Further investigation will be needed to solve the motivating use case another way. Fixes: #25635
* | | | | Merge topic 'find-matlab-docs-mcr-version-mapping' into release-3.28Brad King2024-01-261-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29fece7ef3 FindMatlab: Document that version mappings do not apply to MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9184
| * | | | | FindMatlab: Document that version mappings do not apply to MCRHermann von Kleist2024-01-251-1/+11
| | | | | |
* | | | | | Merge topic 'find-matlab-fix-nonzero-patch-version' into release-3.28Brad King2024-01-261-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1e27b1b9d FindMatlab: Some versions use major.minor.patch in the registry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9183
| * | | | | FindMatlab: Some versions use major.minor.patch in the registryHermann von Kleist2024-01-251-4/+5
| |/ / / / | | | | | | | | | | | | | | | Fixes #25631.
* | | | | Merge topic 'tests-c99' into release-3.28Brad King2024-01-252-11/+17
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a10d2ad397 Tests: Improve C compatibility of LoadCommand tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9186
| * | | | Tests: Improve C compatibility of LoadCommand testsFlorian Weimer2024-01-252-11/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code used `char **` and `const char **`` types as if they were the same. But they are distinct types in C, so when passing these pointers as function arguments, their types have to match. Future C compilers will treat this as an error, similar to what C++ compilers do today.
* | | | Merge topic 'revert-replace-cmsysprocess-with-cmuvprocesschain' into ↵Brad King2024-01-2532-1225/+1186
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.28 bcbb212df7 Revert use of libuv for process execution for 3.28 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9176
| * | | | Revert use of libuv for process execution for 3.28Brad King2024-01-2432-1225/+1186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wide use of CMake 3.28.{1,0[-rcN]} has uncovered some hangs and crashes in libuv SIGCHLD handling on some platforms, particularly in virtualization environments on macOS hosts. Although the bug does not seem to be in CMake, we can restore stability in the CMake 3.28 release series for users of such platforms by reverting our new uses of libuv for process execution. Revert implementation changes merged by commit 4771544386 (Merge topic 'replace-cmsysprocess-with-cmuvprocesschain', 2023-09-06, v3.28.0-rc1~138), but keep test suite updates. Issue: #25414, #25500, #25562, #25589
* | | | | Merge topic 'cmuvprocesschain' into release-3.28Brad King2024-01-2510-52/+38
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | adb3e13d32 cmUVProcessChain: Tolerate fileno() of invalid FILE stream b6e4e4babc cmUVProcessChain: Simplify SetExternalStream usage 116bb2b70f cmUVProcessChain: Simplify builder initialization d32c30906a Tests: Add missing include in testUVProcessChainHelper on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9181
| * | | cmUVProcessChain: Tolerate fileno() of invalid FILE streamBrad King2024-01-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, in a GUI process without a console, the `std{in,out,err}` standard FILE streams may not be open. Avoid passing an invalid file descriptor to the child process, and let libuv attach NUL instead. Fixes: #25625
| * | | cmUVProcessChain: Simplify SetExternalStream usageBrad King2024-01-249-44/+27
| | | | | | | | | | | | | | | | | | | | It is commonly called with the `fileno()` of a `FILE*` stream, so accept the latter directly.
| * | | cmUVProcessChain: Simplify builder initializationBrad King2024-01-242-8/+3
| | | |
| * | | Tests: Add missing include in testUVProcessChainHelper on WindowsBrad King2024-01-241-0/+4
|/ / / | | | | | | | | | We use `STATUS_ACCESS_VIOLATION` from `windows.h`.
* | | Merge topic 'FindMatlab-docs' into release-3.28Brad King2024-01-231-10/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8665d44ba FindMatlab: Fix error message from function 44d2cf3ed4 FindMatlab: Document all registry paths for version lookup 363a7d4693 FindMatlab: matlab_get_release_name_from_version is a function now Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !9175
| * | | FindMatlab: Fix error message from functionHermann von Kleist2024-01-221-1/+1
| | | |
| * | | FindMatlab: Document all registry paths for version lookupHermann von Kleist2024-01-221-3/+4
| | | |
| * | | FindMatlab: matlab_get_release_name_from_version is a function nowHermann von Kleist2024-01-221-6/+2
|/ / /
* | | Merge topic 'cuda-clang' into release-3.28Brad King2024-01-191-6/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6251edc5a4 CUDA/Clang: Record architectures supported by Clang 16 07b7d0ceaa CUDA/Clang: Update architectures supported by CUDA 12 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !9164
| * | | CUDA/Clang: Record architectures supported by Clang 16Brad King2024-01-181-2/+6
| | | |
| * | | CUDA/Clang: Update architectures supported by CUDA 12Brad King2024-01-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4d90f65b24 (CUDA: Update set of architectures supported by CUDA 12, 2022-12-19, v3.26.0-rc1~120^2) we incorrectly guarded dropping removed architectures by compiler id, but it is actually the CUDA 12 toolkit itself that removed support.
* | | | Merge topic 'cxxmodules-export-file-collisions' into release-3.28Brad King2024-01-1915-45/+134
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | d791f3a180 cxxmodules: make export trampoline script files unique 2352dcc830 Source: Simplify hasher object construction Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9166
| * | | cxxmodules: make export trampoline script files uniqueBen Boeckel2024-01-1813-38/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the name of the `EXPORT` in the filename when generating export information for C++ modules. This allows the same directory to be used for multiple sets of C++ module-using targets. For `export(TARGETS)` uses, generate a name based on the hash of the concatenation of the target names involved with the `export()` call. Fixes: #25609
| * | | Source: Simplify hasher object constructionBrad King2024-01-182-7/+6
|/ / /
* | | Merge topic 'FindMatlab-fix-exact-version' into release-3.28Brad King2024-01-181-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7060e2135c FindMatlab: Restore support for finding EXACT major.minor version 88a1392270 FindMatlab: use correct registry view when extracting versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9163
| * | | FindMatlab: Restore support for finding EXACT major.minor versionHermann von Kleist2024-01-171-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By comparing major.minor, the behavior approximately matches pre-3.28 behavior. Fixes: #25605
| * | | FindMatlab: use correct registry view when extracting versionsHermann von Kleist2024-01-171-0/+1
|/ / /
* | | Merge topic 'cxxmodules-obj-lib' into release-3.28Brad King2024-01-175-1/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c09f8d27cd cxxmodules: compute link information for C++ module-consuming targets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !9154
| * | | cxxmodules: compute link information for C++ module-consuming targetsMatheus Izvekov2024-01-145-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute link information for all C++ targets which support modules instead of just those which may provide modules, as they may import modules as well. This captures `OBJECT` libraries using modules which otherwise do not have link steps. Fixes: #25592
* | | | Merge topic 'matlab-win' into release-3.28Brad King2024-01-171-61/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42fbe01eba FindMatlab: Accept long version in matlab_get_release_name_from_version c608adc236 FindMatlab: Fix major.minor version lookups in Windows Registry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9148
generated by cgit v0.12 at 2025-01-12 19:37:05 (GMT)