summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindOpenAL: Add imported targetSam V2022-06-226-0/+68
| | | | Fixes: #20026
* 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
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-06-181-1/+1
| | | | |
* | | | | Merge topic 'cpp-named-module-file-sets'Brad King2022-06-17123-117/+2010
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07bc3b07ec gitlab-ci: test C++ modules using GCC 1b2270aa4e ci: add a Docker image to test out C++ modules with GCC 8c5a53096a Tests/RunCMake/CXXModules: add module-using examples 4151547e2f cmGlobalNinjaGenerator: use `cmModuleMapper` implementation b43bdaff3c cmCxxModuleMapper: implement support for GCC's module map format 02d0f0e752 cmCxxModuleMapper: add source to handle module mapper contents a046a45aad cmGlobalNinjaGenerator: add a TODO for header units 386465bf83 cmTarget: add support for C++ module fileset types ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7369
| * | | | | gitlab-ci: test C++ modules using GCCBen Boeckel2022-06-165-0/+62
| | | | | |
| * | | | | ci: add a Docker image to test out C++ modules with GCCBen Boeckel2022-06-163-0/+42
| | | | | |
| * | | | | Tests/RunCMake/CXXModules: add module-using examplesBen Boeckel2022-06-1626-1/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes a number of examples that should work for various levels of support in a compiler. There are a number of tests which are gated on various features in the compilers. To enable the tests, set `CMake_TEST_MODULE_COMPILATION` to a comma-separated (to avoid `;`-escaping problems) to the list of features which are supported: - `named`: Named modules are supported. - `shared`: Shared libraries with module usage at the API boundary are supported. - `partitions`: Named module partitions are supported. - `internal_partitions`: Named module internal partitions are supported. Additionally, a `CMake_TEST_MODULE_COMPILATION_RULES` file must be passed which contains the rules for how to build modules using the provided compiler. It will be included in the tests to provide these rules. To verify that the file provided works as intended, it must set `CMake_TEST_CXXModules_UUID` to a specific version to indicate that it is an expected file.
| * | | | | cmGlobalNinjaGenerator: use `cmModuleMapper` implementationBen Boeckel2022-06-161-38/+31
| | | | | |
| * | | | | cmCxxModuleMapper: implement support for GCC's module map formatBen Boeckel2022-06-162-0/+47
| | | | | |
| * | | | | cmCxxModuleMapper: add source to handle module mapper contentsBen Boeckel2022-06-164-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow all generators to share an implementation for actually writing out the module map formats.
| * | | | | cmGlobalNinjaGenerator: add a TODO for header unitsBen Boeckel2022-06-161-1/+2
| | | | | |
| * | | | | cmTarget: add support for C++ module fileset typesBen Boeckel2022-06-1682-74/+1290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++ modules have two variants which are of importance to CMake: - `CXX_MODULES`: interface modules (those using `export module M;`, `export module M:part;`, or `module M:internal_part;`) - `CXX_MODULE_HEADER_UNITS`: importable header units Creating C++ modules or partitions are *not* supported in any other source listing. This is because the source files must be installed (so their scope matters), but not part of usage requirements (what it means for a module source to be injected into a consumer is not clear at this moment). Due to the way `FILE_SET` works with scopes, they are a perfect fit as long as `INTERFACE` is not allowed (which it is not).
| * | | | | cmExperimental: add an experimental feature to handle C++ modulesBen Boeckel2022-06-143-1/+27
| | | | | |
| * | | | | cmExperimental: add a mechanism for experimental CMake featuresBen Boeckel2022-06-144-0/+78
| | | | | |
| * | | | | cmGlobalXCodeGenerator: avoid unused parameter warningsBen Boeckel2022-06-141-0/+4
| | | | | |
| * | | | | cmScriptGenerator: remove unnecessary `endif` argumentsBen Boeckel2022-06-141-1/+1
| | | | | |
| * | | | | cmNinjaTargetGenerator: expand CFGIntDir for NMCBen Boeckel2022-06-141-2/+3
| | | | | |
| * | | | | cmGlobalNinjaGenerator: simplify a string building callBen Boeckel2022-06-141-1/+1
| | | | | |
| * | | | | cmCommonTargetGenerator: fix linked target directory for multi-config buildsBen Boeckel2022-06-141-0/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Without this, `Ninja Multi-Config` generators were not getting the right directory to look for `<LANG>Modules.json` files for module information.
* | | | | Merge topic 'cmake-mode-bracket-comment-argument'Brad King2022-06-171-1/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 364ca22b12 cmake-mode.el: add support for bracket_comment and bracket_argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7375
| * | | | | cmake-mode.el: add support for bracket_comment and bracket_argumentmontag4512022-06-171-1/+37
| | | | | |
* | | | | | Merge topic 'try_compile-cross-app-bundles'Brad King2022-06-171-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81549baff4 try_compile: Fix COPY_FILE with app-bundles on non-macOS hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7377
| * | | | | | try_compile: Fix COPY_FILE with app-bundles on non-macOS hostsHeiko Lewin2022-06-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross compiling from eg linux to apple-platforms requires handling of .app-Bundles. Fixes: #23597
* | | | | | | Merge topic 'find-wxwidgets'Brad King2022-06-171-95/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c9106538f FindwxWidgets: Support more wxWidgets versions, including 3.2 d8a2edb74e FindwxWidgets: Use version number from header for library names 2f2fe1a2e3 FindwxWidgets: Move extracting version number to a macro Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7374
| * | | | | | | FindwxWidgets: Support more wxWidgets versions, including 3.2Maarten Bent2022-06-151-40/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the example to use a more recent wxWidgets version. Use a list with known version numbers when searching for installation directories and wx-config names.
| * | | | | | | FindwxWidgets: Use version number from header for library namesMaarten Bent2022-06-151-35/+12
| | | | | | | |