summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* visionOS: Update deployment-target flag for Xcode 15.1 betaBrad King2024-02-092-6/+39
| | | | | | | | Use the same flags Xcode adds for `XROS_DEPLOYMENT_TARGET`. They are `-target arm64-apple-xros1.0` and `-target arm64-apple-xros1.0-simulator`, where `1.0` is the deployment target version. Fixes: #25188
* cmLocalGenerator: Avoid unnecessary lookup without a deployment targetBrad King2024-02-091-8/+10
|
* Merge topic 'ci-xcode-15.2' into release-3.28Brad King2024-02-091-6/+6
|\ | | | | | | | | | | | | 68157fc57d gitlab-ci: update macOS jobs to use Xcode 15.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9237
| * gitlab-ci: update macOS jobs to use Xcode 15.2Brad King2024-02-081-6/+6
| |
* | Merge topic 'FindCUDAToolkit-cudart-deps' into release-3.28Brad King2024-02-091-8/+5
|\ \ | | | | | | | | | | | | | | | | | | 4a3cafec4f FindCUDAToolkit: Fix cudart dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9236
| * | FindCUDAToolkit: Fix cudart dependenciesRobert Maynard2024-02-081-8/+5
| | | | | | | | | | | | Fixes: #25665
* | | Merge topic 'libuv-1.48' into release-3.28Brad King2024-02-094-11/+24
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 077a1d5769 libuv: win/spawn: optionally run executable paths with no file extension f02ac51150 libuv: Revert "win/spawn: run executables with no file extension" 58a271e60b cmUVProcessChain: Implement no-extension-on-Windows support with libuv 1.48 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9238
| * | libuv: win/spawn: optionally run executable paths with no file extensionBrad King2024-02-084-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | Backport libuv commit `3f7191e5` (win/spawn: optionally run executable paths with no file extension, 2024-02-05, v1.48.0~8) to add the `UV_PROCESS_WINDOWS_FILE_PATH_EXACT_NAME` option we now use. Issue: #25450
| * | libuv: Revert "win/spawn: run executables with no file extension"Brad King2024-02-081-6/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc6231bee5 (libuv: win/spawn: run executables with no file extension, 2023-12-04, v3.28.0~9^2) to make room for the corresponding fix from upstream libuv 1.48. Record this as a merge from the last-imported upstream libuv snapshot branch so that future `git blame` points to the upstream for the original code instead of this commit. Issue: #25450
| * | | cmUVProcessChain: Implement no-extension-on-Windows support with libuv 1.48Brad King2024-02-081-0/+3
|/ / / | | | | | | | | | | | | Use the new `UV_PROCESS_WINDOWS_FILE_PATH_EXACT_NAME` option when building against libuv 1.48 or higher.
* | | Merge topic 'findmatlab-registry-lookup-without-versionxml' into release-3.28Brad King2024-02-081-12/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e22c4dfea0 FindMatlab: Revert undocumented and now-unnecessary full version lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9226
| * | | FindMatlab: Revert undocumented and now-unnecessary full version lookupHermann von Kleist2024-02-071-12/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert commit dc9d9589e4 (FindMatlab:WIN32: return full Matlab version when found via registry, 2023-09-14, v3.28.0-rc1~82^2~2). It changed `matlab_extract_all_installed_versions_from_registry` behavior to query `VersionInfo.xml` for version information. However, the function documentation states that it only uses the registry. It's also not needed since commit c608adc236 (FindMatlab: Fix major.minor version lookups in Windows Registry, 2024-01-11, v3.28.2~13^2~1), which added the same lookup to `matlab_get_all_valid_matlab_roots_from_registry`.
* | | Merge topic 'clang-cl-showIncludes' into release-3.28Brad King2024-02-079-6/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 0d933fc0d9 Ninja: Update showIncludes prefix detection for clang-cl 18 a88acb0a41 Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9229
| * | Ninja: Update showIncludes prefix detection for clang-cl 18Martin Storsjö2024-02-076-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit LLVM/Clang commit `5523fefb01c2` ([clang][lex] Use preferred path separator in includer-relative lookup, 2023-09-08), part of the upcoming 18.x release, the output format of the showIncludes flag has changed, where it now prints paths with double backslashes: Note: including file: .\\foo.h Previously, we expected to see the path name in the form "./foo.h". Extend the regex to match a path name starting with `.\`, in addition to the existing matched patterns.
| * | Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17Brad King2024-02-075-5/+5
|/ / | | | | | | Make room for a new case for clang-cl 18.
* | 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
| | | | |
generated by cgit v0.12 at 2024-12-28 19:33:58 (GMT)