summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2022-06-131-1/+1
|
* Merge branch 'release-3.24'Brad King2022-06-120-0/+0
|\
| * 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
* | \ Merge topic 'zlib-mangle'Brad 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.
* | | CMake Nightly Date StampKitware Robot2022-06-121-1/+1
| | |
* | | Merge branch 'release-3.24'Brad King2022-06-110-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | \ \ Merge topic 'fetchcontent-global-targets'Brad 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 branch 'release-3.24'Brad King2022-06-110-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | \ \ \ Merge topic 'cmake-gui-qt6-decode'Brad 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 branch 'release-3.24'Brad King2022-06-110-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | \ \ \ Merge topic 'cmWindowsRegistry-cstdint'Brad 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 branch 'release-3.24'Brad King2022-06-110-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'doc-3.24-release-notes-cleanup'Brad 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.24'Brad King2022-06-110-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.23' into release-3.24Brad King2022-06-110-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release-3.23'Brad 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.23Brad King2022-06-113-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7350
* | \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-06-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'xcode-14' into release-3.22Brad King2022-06-113-1/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !7350
* | | | | | | | | Merge branch 'release-3.24'Brad King2022-06-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | Merge topic 'xcode-14'Brad 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
* | | | | | | CMake Nightly Date StampKitware Robot2022-06-111-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.24'Brad King2022-06-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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 topic 'update-kwsys'Brad 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 branch 'release-3.24'Brad King2022-06-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'ExternalProject-stamp-genex'Brad 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 branch 'release-3.24'Brad King2022-06-100-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | | Merge topic 'CheckIPOSupported-honor-flags'Brad 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