summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'spelling-occurred' into release-3.24Brad King2022-06-1456-212/+212
|\ | | | | | | | | | | | | | | 98a10290a8 cmSystemTools: Fix 'ErrorOccurred' spelling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7353
| * cmSystemTools: Fix 'ErrorOccurred' spellingFeRD (Frank Dana)2022-06-1356-212/+212
|/ | | | | | | | Rename the booleans 's_ErrorOccured' and 's_FatalErrorOccured' to 's_ErrorOccurred' and 's_FatalErrorOccurred', respectively. Rename the getters and setters to 'Get[Fatal]ErrorOccurred' and 'Set[Fatal]ErrorOccurred', and fix all uses across the codebase.
* Merge topic 'zlib-mangle' into release-3.24Brad King2022-06-125-0/+155
|\ | | | | | | | | | | | | | | 29c578c8fb zlib: Mangle symbols to avoid conflict with external transitive dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7351
| * zlib: Mangle symbols to avoid conflict with external transitive dependenciesBrad King2022-06-115-0/+155
| | | | | | | | | | | | Mangling was dropped by commit fc22ac115e (zlib: Drop old sources to make room for a fresh import, 2022-05-26). Restore it for the new import of upstream zlib.
* | Merge topic 'fetchcontent-global-targets' into release-3.24Brad King2022-06-1110-6/+121
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f19b48e0b8 FetchContent: Honor CMAKE_FIND_PACKAGE_TARGETS_GLOBAL 1305bade56 Help: Add missing version directive for find_package() GLOBAL keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7347
| * | FetchContent: Honor CMAKE_FIND_PACKAGE_TARGETS_GLOBALCraig Scott2022-06-109-2/+116
| | | | | | | | | Fixes: #23606
| * | Help: Add missing version directive for find_package() GLOBAL keywordCraig Scott2022-06-101-4/+5
| | |
* | | Merge topic 'cmake-gui-qt6-decode' into release-3.24Brad King2022-06-115-105/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 497397bd17 cmake-gui: Support non-ASCII chars on Windows with Qt6 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7346
| * | | cmake-gui: Support non-ASCII chars on Windows with Qt6Mehdi Chinoune2022-06-105-105/+81
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Since commit baead1e2a8 (Encoding: Remove option to use ANSI code page internally, 2016-11-01, v3.8.0-rc1~358^2), we always use UTF-8 strings internally. Using fromLocal8Bit/toLocal8Bit + QTextCodec is no longer needed. Convert to fromStdString/toStdString instead, which should work both with Qt5 and Qt6. Fixes: #23565
* | | Merge topic 'cmWindowsRegistry-cstdint' into release-3.24Brad King2022-06-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bc4c0d657a cmWindowsRegistry: Add missing <cstdint> include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7349
| * | | cmWindowsRegistry: Add missing <cstdint> includenanoric2022-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed for `std::uint8_t`, but was left out of commit 8d7e80cf3d (find_* commands: add control over Windows registry views, 2022-04-16). For some reason the include-what-you-use tool does not think the include is needed, so add an `IWYU pragma` to keep it.
* | | | Merge topic 'doc-3.24-release-notes-cleanup' into release-3.24Brad King2022-06-112-24/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce0be99b30 Help: Minor cleanups of 3.24 release notes 35ecc6e39b Help: Trivial grammar fixup in LINK_GROUPS genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7342
| * | | | Help: Minor cleanups of 3.24 release notesCraig Scott2022-06-101-23/+25
| | | | |
| * | | | Help: Trivial grammar fixup in LINK_GROUPS genexCraig Scott2022-06-101-1/+1
| | | | |
* | | | | Merge branch 'release-3.23' into release-3.24Brad King2022-06-110-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'release-3.22' into release-3.23Brad King2022-06-110-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'xcode-14' into release-3.22Brad King2022-06-113-1/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7350
| * | \ \ \ \ \ Merge branch 'xcode-14' into release-3.23Brad King2022-06-113-1/+6
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !7350
* | | | | | | | Merge topic 'xcode-14' into release-3.24Brad King2022-06-113-1/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 627c08e28b Tests: Teach RunCMake to ignore Xcode DVTSDK warnings ab40020b17 Xcode: Suppress "Run Script" build phase warning during compiler id 89e1113e0c Xcode: Use ad-hoc signing during compiler id on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7350
| * | | | | | Tests: Teach RunCMake to ignore Xcode DVTSDK warningsBrad King2022-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] [MT] DVTSDK: Warning: SDK path collision for path ... Teach RunCMake to drop such incidental lines before matching against expected output.
| * | | | | | Xcode: Suppress "Run Script" build phase warning during compiler idBrad King2022-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: Run script build phase 'Run Script' will be run during every build because it does not specify any outputs.
| * | | | | | Xcode: Use ad-hoc signing during compiler id on macOSBrad King2022-06-102-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 14 no longer accepts an empty signing identity for macOS. However, Xcode in general does not accept an ad-hoc signing identity for iOS. Switch based on the target platform. Fixes: #23609
* | | | | | Merge topic 'update-kwsys' into release-3.24Brad King2022-06-101-0/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a54f7a6983 Merge branch 'upstream-KWSys' into update-kwsys 975c44654d KWSys 2022-06-09 (9b65e88d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7345
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-06-091-0/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-06-09 (9b65e88d)
| | * | | | | KWSys 2022-06-09 (9b65e88d)KWSys Upstream2022-06-091-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9b65e88d077e023f5e4e22f31bd0970e4071eb5b (master). Upstream Shortlog ----------------- Saleem Abdulrasool (1): 0969597d SystemTools: add a clonefile optimization on macOS
* | | | | | | Merge topic 'ExternalProject-stamp-genex' into release-3.24Brad King2022-06-103-15/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c111d440ce ExternalProject: Express per-config step stamp file paths using CONFIG genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7341
| * | | | | | | ExternalProject: Express per-config step stamp file paths using CONFIG genexBrad King2022-06-083-15/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ExternalProject module has long used the generator-specific placeholder in the `${CMAKE_CFG_INTDIR}` variable to express per-config stamp file paths in multi-config generators. Now that most generators support generator expressions in custom command outputs, we can use the `$<CONFIG>` genex instead. In particular, this fixes cross-config `BUILD_BYPRODUCTS` with the Ninja Multi-Config generator. Fixes: #23595
* | | | | | | | Merge topic 'CheckIPOSupported-honor-flags' into release-3.24Brad King2022-06-1014-3/+90
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec08bc1752 CheckIPOSupported: Compile check using flags of calling project Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7343
| * | | | | | | CheckIPOSupported: Compile check using flags of calling projectBrad King2022-06-1014-3/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward `CMAKE_<LANG>_FLAGS` and `CMAKE_<LANG>_FLAGS_DEBUG` from the calling project into the test project. The set of flags may affect the availability of IPO support. Since this may change the result of the check for existing projects, add a policy for compatibility. This was discovered after commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86 and x64, 2022-05-24) introduced policy CMP0138 to switch our default for MSVC's debug info flag. The `-ZI` flag is incompatible with the `-GL` flag used for IPO, so CMP0138 was reverted pending future work on an alternative solution. Re-use the CMP0138 policy number for this change to CheckIPOSupported instead. Fixes: #23607
* | | | | | | | Merge topic 'revert-msvc-compilers-default-to-ZI' into release-3.24Brad King2022-06-1014-100/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 7d73e88d3a MSVC: Revert "Default to -ZI instead of /Zi for x86 and x64" Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7344
| * | | | | | MSVC: Revert "Default to -ZI instead of /Zi for x86 and x64"Brad King2022-06-0914-100/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86 and x64, 2022-05-24). The `-ZI` flag is incompatible with the `-GL` flag used for IPO, and so is not an unconditionally better default. Revert the change pending future design of a first-class setting for MSVC debug info format that can be automatically reconciled with IPO settings. That commit introduced policy CMP0138, but we already have later policy numbers used too. Leave placeholder text to avoid policy renumbering. Issue: #23607, #10189
* | | | | | Merge topic 'vs-android-api' into release-3.24Brad King2022-06-091-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d6a080421 VS: Add AndroidAPILevel element to generated project files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7339
| * | | | | | VS: Add AndroidAPILevel element to generated project filesBenjamín de la Fuente Ranea2022-06-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map `CMAKE_SYSTEM_VERSION` to the Android Target API Level for Visual Studio projects. Fixes: #22886
* | | | | | | Merge topic 'doc-using-deps-guide' into release-3.24Brad King2022-06-095-174/+405
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92e93f5c9e Help: Overhaul and expand the Using Dependencies Guide Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !7332
| * | | | | | | Help: Overhaul and expand the Using Dependencies GuideCraig Scott2022-06-095-174/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guide previously only focused on the find_package() command, with a bias towards libraries. FetchContent was not mentioned at all. Reorganise and update the existing content. Add new sections to cover providing dependencies with FetchContent and dependency providers. Improve discoverability of the guide by mentioning it at the beginning of the find_package(), FetchContent and dependency provider docs.
* | | | | | | | Begin 3.24 release versioningBrad King2022-06-081-3/+3
| | | | | | | |
* | | | | | | | Help: Drop development topic notes to prepare releaseBrad King2022-06-082-9/+0
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | | | | | Merge topic 'doc-3.24-relnotes'Brad King2022-06-0860-406/+353
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 253941634c Help: Update Sphinx versionadded directives for 3.24 release a811489b35 Help: Organize and revise 3.24 release notes a3fc469882 Help: Consolidate 3.24 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7338
| * | | | | | Help: Update Sphinx versionadded directives for 3.24 releaseBrad King2022-06-084-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the script: Utilities/Sphinx/update_versions.py --since v3.23.0 --overwrite
| * | | | | | Help: Organize and revise 3.24 release notesBrad King2022-06-081-205/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.23 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | | | | Help: Consolidate 3.24 release notesBrad King2022-06-0756-406/+307
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.24.rst`.
* | | | | | Merge topic 'ci-nmc'Brad King2022-06-087-0/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ed06404bf gitlab-ci: add nightly job testing Ninja Multi-Config on Windows e39acc2b3a gitlab-ci: add nightly job testing Ninja Multi-Config on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7337
| * | | | | | gitlab-ci: add nightly job testing Ninja Multi-Config on WindowsBrad King2022-06-074-0/+44
| | | | | | |
| * | | | | | gitlab-ci: add nightly job testing Ninja Multi-Config on macOSBrad King2022-06-074-0/+31
| |/ / / / /
* | | | | | Merge topic 'set_source_files_properties'Brad King2022-06-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a37b7fd77 Help: Fix typo with misnamed set_source_files_property() in example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7340
| * | | | | | Help: Fix typo with misnamed set_source_files_property() in exampleDan Walsh2022-06-081-1/+1
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2022-06-081-1/+1
|/ / / / /
* | | | | Merge topic 'ci-ispc'Brad King2022-06-0723-22/+110
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d14349c907 ci: Enable ISPC tests on Linux, Windows, and macOS nightly builds 49996faaac ci: remove ISPC from the Fedora CI image 3e791592ad gitlab-ci: init macOS and Windows jobs with per-CMAKE_CONFIGURATION scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7336
| * | | | | ci: Enable ISPC tests on Linux, Windows, and macOS nightly buildsBrad King2022-06-0616-0/+102
| | | | | |
| * | | | | ci: remove ISPC from the Fedora CI imageBrad King2022-06-067-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 5ece12b7e4 (gitlab-ci: add ISPC to the Fedora CI image, 2020-08-18, v3.19.0-rc1~244^2). Later we will download ISPC in specific jobs. Update a `RunCMake.NinjaMultiConfig` test expectation to account for a change to the Qt deployed on Fedora 36.
generated by cgit v0.12 at 2025-09-15 04:29:28 (GMT)