summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-06-221-9/+31
|\ | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-06-21 (d427a180)
| * KWSys 2022-06-21 (d427a180)KWSys Upstream2022-06-221-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit d427a18072e2f37108aeeadf41ed4a21b4be3ab1 (master). Upstream Shortlog ----------------- Clemens Wasser (2): ab7c8f6f SystemTools: Factor out RemoveTrailingSlashes ca9646bd SystemTools: Optimize FileIsExecutable on Windows
* | Merge topic 'FindPython-registry-management'Brad King2022-06-221-12/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | 0201530bdb FindPython: enhance windows registry handling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7384
| * | FindPython: enhance windows registry handlingMarc Chevrier2022-06-211-12/+25
| | |
* | | Merge topic 'glew'Brad King2022-06-221-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a31b270785 FindGLEW: Set documented variables when found via upstream package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7390
| * | | FindGLEW: Set documented variables when found via upstream packageMarkus Mützel2022-06-211-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GLEW is found by `find_package` (most of) the variables described in the documentation of `FindGLEW` aren't set. That could lead to issues when building packages that rely on these variables. Fixes: #19662
* | | | Merge branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \
| * \ \ \ 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
* | \ \ \ \ Merge topic 'FetchContent-doc-example'Brad 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 branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'FindMPI-l-colon'Brad 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 branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'use-arm64-msbuild'Brad 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 branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'xcode14'Brad 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 branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'ci-openal'Brad 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.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.23' into release-3.24Brad King2022-06-220-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release-3.23'Brad 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 branch 'release-3.24'Brad King2022-06-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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 topic 'ExternalProject-stamp-cfgdir'Brad 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
* | | | | | CMake Nightly Date StampKitware Robot2022-06-221-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'add_export_no_system'Brad King2022-06-217-3/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9680b3b279 Add EXPORT_NO_SYSTEM target property, deprecate IMPORTED_NO_SYSTEM Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7379
| * | | | | Add EXPORT_NO_SYSTEM target property, deprecate IMPORTED_NO_SYSTEMDa Quexian2022-06-177-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #18040 Signed-off-by: Da Quexian <daquexian566@gmail.com>
* | | | | | Merge topic 'drhpc-findblas-pkgconfig'Brad King2022-06-212-2/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70f15d202f Modules/Find{BLAS,LAPACK}: allow choice of pkg-config package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7370
| * | | | | | Modules/Find{BLAS,LAPACK}: allow choice of pkg-config packageDr. Thomas Orgis2022-06-172-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BLA_PREFER_PKGCONFIG switch is not that useful if you are not able to specify the pkg-config package to use. This adds BLA_PKGCONFIG_BLAS and BLA_PKGCONFIG_LAPACK to that effect, allowing user choice in environments that install differing variants of the BLAS libraries with distinct .pc file names. This is part of work to get more standardized installations of the BLAS libs with specific names, likely blas.pc and lapack.pc only for Netlib reference code, or maybe blas-netlib.pc and lapack-netlib.pc, in any case distinct from choices like openblas-openmp.pc.
* | | | | | | CMake Nightly Date StampKitware Robot2022-06-211-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release-3.24'Brad King2022-06-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'ci-rel-win-arm64'Brad 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
* | | | | | CMake Nightly Date StampKitware Robot2022-06-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-06-191-1/+1
| | | | | |