summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Add variable to to turn off Visual Studio compile batchingBrad King2022-06-226-5/+31
| | | | | | | | | Extend the change from commit b764c7c273 (VS: Add property to turn off Visual Studio compile batching, 2022-02-07, v3.24.0-rc1~710^2) by adding a variable to initialize the property on every target. Issue: #23179 Fixes: #23639
* Help: Improve formatting in VS_NO_COMPILE_BATCHING docsBrad King2022-06-221-4/+4
|
* Merge topic 'FetchContent-doc-example' into release-3.24Brad King2022-06-221-3/+3
|\ | | | | | | | | | | | | | | 641d97e03f FetchContent: Fix example code in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7393
| * FetchContent: Fix example code in documentationpigeon2022-06-211-3/+3
| |
* | Merge topic 'FindMPI-l-colon' into release-3.24Brad King2022-06-221-8/+13
|\ \ | | | | | | | | | | | | | | | | | | a606609499 FindMPI: Parse '-l:' flags in pkg-config output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7392
| * | FindMPI: Parse '-l:' flags in pkg-config outputMarkus Mützel2022-06-211-8/+13
| |/ | | | | | | | | | | | | | | | | | | With the msmpi package in MSYS2: $ pkg-config --libs msmpi -LC:/msys64/mingw64/lib -l:libmsmpi.dll.a MSYS2-Issue: https://github.com/msys2/MINGW-packages/pull/11839 Fixes: #23620
* | Merge topic 'use-arm64-msbuild' into release-3.24Brad King2022-06-221-0/+8
|\ \ | | | | | | | | | | | | | | | | | | 80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7381
| * | VS: Prefer ARM64 MSBuild on Windows ARM64 hostTommy Vercetti2022-06-211-0/+8
| |/ | | | | | | Fixes: #23629
* | Merge topic 'xcode14' into release-3.24Brad King2022-06-222-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 7c79fde5fb Xcode: automatically create Info.plist for signing during compiler id 116cc5a57b cm_cxx_features: filter out warnings from Xcode 14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7391
| * | Xcode: automatically create Info.plist for signing during compiler idGregor Jasny2022-06-211-0/+1
| | | | | | | | | | | | | | | Extend the Xcode 14 update from commit 89e1113e0c (Xcode: Use ad-hoc signing during compiler id on macOS, 2022-06-10, v3.24.0-rc1~13^2~2).
| * | cm_cxx_features: filter out warnings from Xcode 14Gregor Jasny2022-06-211-1/+1
| |/ | | | | | | | | | | ``` xcodebuild[13070:54426] [MT] DVTSDK: Warning: SDK path collision for path ```
* | Merge topic 'ci-openal' into release-3.24Brad King2022-06-224-3/+6
|\ \ | | | | | | | | | | | | | | | | | | b97d371007 ci: Add OpenAL to Debian and Fedora base images Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7394
| * | ci: Add OpenAL to Debian and Fedora base imagesBrad King2022-06-214-3/+6
| |/
* | Merge branch 'release-3.23' into release-3.24Brad King2022-06-220-0/+0
|\ \
| * \ Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' into release-3.23Brad King2022-06-222-1/+6
| |\ \ | | | | | | | | | | | | Merge-request: !7396
* | \ \ Merge topic 'ExternalProject-stamp-cfgdir' into release-3.24Brad King2022-06-222-1/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a1e45fdec Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' 5022b42f8b ExternalProject: Fix regression in stamp creation for Xcode+iOS 7b622f3e80 ExternalProject: Fix regression in stamp creation for Xcode+iOS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7396
| * | | Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir'Brad King2022-06-210-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | ExternalProject: Fix regression in stamp creation for Xcode+iOSBrad King2022-06-212-1/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to `_ep_add_mkdir_command` in commit 5fbac2bb24 (ExternalProject: Move inline scripts to separate files, 2022-01-22, v3.23.0-rc1~101^2) did not account for the possibility that `CMAKE_CFG_INTDIR` is `$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)` instead of just the configuration name. Pass the value into the helper script on the command line so that the native buildsystem placeholders are evaluated. Fixes: #23645
| * | ExternalProject: Fix regression in stamp creation for Xcode+iOSBrad King2022-06-212-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | The change to `_ep_add_mkdir_command` in commit 5fbac2bb24 (ExternalProject: Move inline scripts to separate files, 2022-01-22, v3.23.0-rc1~101^2) did not account for the possibility that `CMAKE_CFG_INTDIR` is `$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)` instead of just the configuration name. Pass the value into the helper script on the command line so that the native buildsystem placeholders are evaluated. Fixes: #23645
* | Merge topic 'ci-rel-win-arm64' into release-3.24Brad King2022-06-203-138/+124
|\ \ | | | | | | | | | | | | | | | | | | | | | 41ea4d4de8 ci: Rebuild Qt 6.3.0 windows-arm64 dependency with LLVM/Clang e0d9ee0cc4 Utilities/Release: Simplify script to build Qt 6.3.0 Windows binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7380
| * | ci: Rebuild Qt 6.3.0 windows-arm64 dependency with LLVM/ClangBrad King2022-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7a21173b0e (gitlab-ci: Add job to build Windows arm64 binaries, 2022-06-13, v3.24.0-rc1~4^2~1) we built the Qt binaries using the MSVC 14.32 toolset targeting arm64. However, the `cmake-gui` built with them does not start, perhaps due to a bug in MSVC's ARM64 support. Run the `Utilities/Release/win/qtbase-6.3.0-win-msvc.cmake` script for `i386` and `x86_64`. Run it for `arm64` with the `clang-cl` argument. Issue: #21902
| * | Utilities/Release: Simplify script to build Qt 6.3.0 Windows binariesCristian Adam2022-06-172-135/+121
|/ / | | | | | | | | | | | | | | | | Revise and simplify the script from commit d0c9225a7e (Utilities/Release: Add script to build Qt 6.3.0 Windows binaries, 2022-06-10, v3.24.0-rc1~4^2~5). For `cmake-gui` we only need QtBase. Also, convert to a `.cmake` script. Issue: #21902
* | Merge topic 'ci-rel-win-arm64-nightly' into release-3.24Brad King2022-06-153-6/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 24099112c0 gitlab-ci: Add jobs to package and upload Windows arm64 nightly binaries dfa5401af6 ci: use CMake 3.24.0-rc1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7368
| * | gitlab-ci: Add jobs to package and upload Windows arm64 nightly binariesBrad King2022-06-141-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 7a21173b0e (gitlab-ci: Add job to build Windows arm64 binaries, 2022-06-13, v3.24.0-rc1~4^2~1). Base the package and upload jobs on the approach from commit 4c7c66dcf5 (gitlab-ci: Add jobs to make Windows x86_64 and i386 packages, 2022-05-19). Issue: #21902
| * | ci: use CMake 3.24.0-rc1Brad King2022-06-142-6/+6
|/ /
* | CMake 3.24.0-rc1v3.24.0-rc1Brad King2022-06-141-1/+1
| |
* | Merge topic 'doctop' into release-3.24Brad King2022-06-142-6/+20
|\ \ | | | | | | | | | | | | | | | | | | 75aedb1204 Help: Clarify PROJECT_IS_TOP_LEVEL behavior w.r.t. add_subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7362
| * | Help: Clarify PROJECT_IS_TOP_LEVEL behavior w.r.t. add_subdirectoryMichael Hirsch2022-06-142-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | Clarify documentation added by commit 2df4badc5f (Help: Note PROJECT_IS_TOP_LEVEL behavior w.r.t. ExternalProject, 2021-07-05, v3.21.0-rc3~1^2). Fixes: #23511
* | | Merge topic 'fortc-warn' into release-3.24Brad King2022-06-141-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 812000904e Tests: Add Fortran test C function prototype Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7363
| * | | Tests: Add Fortran test C function prototypeWilliam R. Dieter2022-06-141-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | One of three Fortran/C interface test functions is missing a prototype, which causes warnings and sometimes errors depending on compiler versions and flags. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | Merge topic 'update-kwiml' into release-3.24Brad King2022-06-141-1/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 82eb512637 Merge branch 'upstream-KWIML' into update-kwiml 2a233bb754 KWIML 2022-06-14 (7b9bd7fe) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7356
| * | Merge branch 'upstream-KWIML' into update-kwimlBrad King2022-06-141-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | # By KWIML Upstream * upstream-KWIML: KWIML 2022-06-14 (7b9bd7fe)
| | * | KWIML 2022-06-14 (7b9bd7fe)KWIML Upstream2022-06-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit 7b9bd7fe925396d06d3d9540b4863d6d2382661d (master). Upstream Shortlog ----------------- Brad King (2): 33c2acf1 test: Replace sprintf with snprintf 7b9bd7fe test: Avoid snprintf on MSVC before VS 2015
* | | | Merge topic 'ci-rel-win-arm64' into release-3.24Brad King2022-06-1415-21/+240
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d084718eb9 Utilities/Release: Add windows-arm64 package to file table 7a21173b0e gitlab-ci: Add job to build Windows arm64 binaries 06c6e76a12 ci: update to WiX 3.14.0.6526 cca3a73ef0 ci: Factor out Windows x86-family-specific package configuration add3dc9508 ci: Re-order logic for downloading Qt during packaging d0c9225a7e Utilities/Release: Add script to build Qt 6.3.0 Windows binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7360
| * | | | Utilities/Release: Add windows-arm64 package to file tableBrad King2022-06-133-1/+15
| | | | |
| * | | | gitlab-ci: Add job to build Windows arm64 binariesBrad King2022-06-136-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base it on the approach from commit 4c7c66dcf5 (gitlab-ci: Add jobs to make Windows x86_64 and i386 packages, 2022-05-19). Leave out the packaging and upload steps for now because they are only for the nightly binaries, and will need a new release of CPack to pass the `arm64` architecture to WiX. Issue: #21902
| * | | | ci: update to WiX 3.14.0.6526Brad King2022-06-131-4/+4
| | | | | | | | | | | | | | | | | | | | This version supports the `arm64` architecture.
| * | | | ci: Factor out Windows x86-family-specific package configurationBrad King2022-06-134-14/+16
| | | | |
| * | | | ci: Re-order logic for downloading Qt during packagingBrad King2022-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | Prepare to support per-architecture URLs.
| * | | | Utilities/Release: Add script to build Qt 6.3.0 Windows binariesBrad King2022-06-131-0/+135
| |/ / / | | | | | | | | | | | | These may be used to build CMake binaries for Windows.
* | | | Merge topic 'lcc-warnings' into release-3.24Brad King2022-06-142-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beb07cdda7 Source: Convince LCC that RAII variables are used Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7357
| * | | | Source: Convince LCC that RAII variables are usedBrad King2022-06-132-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | Extend the change from commit 5ad8862318 (Source: Convince NVHPC that RAII variables are used, 2021-04-26, v3.21.0-rc1~254^2~1) to apply to LCC too.
* | | | 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
generated by cgit v0.12 at 2025-01-23 15:53:00 (GMT)