summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ci-xcode-13.4' into release-3.22Brad King2022-07-281-6/+6
|\ | | | | | | Merge-request: !7520
| * gitlab-ci: update macOS jobs to use Xcode 13.4Brad King2022-07-281-6/+6
|/
* Merge branch 'rel-macos-sign-notarize' into release-3.22Brad King2022-07-081-18/+25
|\ | | | | | | Merge-request: !7463
| * Utilities/Release: Update macOS notarization script to use notarytoolBrad King2022-07-081-18/+25
|/ | | | | `xcnotary` is no longer needed since `altool` has been deprecated in favor of `notarytool`, which has builtin support for waiting.
* Merge branch 'FindLAPACK-nvhpc' into release-3.22Brad King2022-07-071-2/+7
|\ | | | | | | Merge-request: !7452
| * FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilersEisuke Kawashima2022-07-061-2/+7
|/ | | | | | | | | | | | | | | Since commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the NVHPC LAPACK library, 2021-05-05, v3.21.0-rc1~192^2) we try the `-fortranlibs` option as a dependency of the NVHPC LAPACK. That flag is specific to the NVHPC/PGI compilers, so use it conditionally with them. Without this modification, CMake fails to find LAPACK if - compiler ID is GNU - `BLA_STATIC` is `ON` - `BLA_VENDOR` is not defined or set to `All` Fixes: #23705, #22878
* Merge branch 'xcode-14' into release-3.22Brad King2022-06-113-1/+6
|\ | | | | | | 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 3.22.5v3.22.5Brad King2022-06-012-4/+4
|
* Merge branch 'release-3.21' into release-3.22Brad King2022-06-011-2/+2
|\
| * CMake 3.21.7v3.21.7Brad King2022-06-012-3/+3
| |
* | Merge branch 'release-3.21' into release-3.22Brad King2022-05-310-0/+0
|\ \ | |/
| * Merge branch 'release-3.20' into release-3.21Brad King2022-05-310-0/+0
| |\
| | * Merge branch 'cmake-gui-locale' into release-3.20Brad King2022-05-271-0/+14
| | |\ | | | | | | | | | | | | Merge-request: !7303
| * | \ Merge branch 'cmake-gui-locale' into release-3.21Brad King2022-05-271-0/+14
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !7303
* | | | Merge branch 'cmake-gui-locale' into release-3.22Brad King2022-05-271-0/+14
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !7303
| * | | cmake-gui: Restore support for internationalization with Qt5 on WindowsBrad King2022-05-271-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Restore the logic removed by commit 035078d847 (cmake-gui: Remove explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with Qt5 on Windows. Leave a FIXME comment to support Qt6 later. Fixes: #23562 Issue: #23565
* | | Merge topic 'backport-update-libarchive' into release-3.22Brad King2022-05-2444-827/+1807
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3 ac5e524763 libarchive: include archive_platform.h first in blake2s sources b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive 9fd16c5b5b LibArchive 2022-02-08 (673c1eae) de38c89252 libarchive: Update script to get 3.5.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7294
| * | | libarchive: Update build within CMake after changes in 3.5.3Brad King2022-05-241-0/+2
| | | |
| * | | libarchive: include archive_platform.h first in blake2s sourcesBrad King2022-05-242-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is the libarchive convention in all other `.c` sources. It ensures that the configured `_WIN32_WINNT` value is defined before including any system headers.
| * | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2022-05-2440-826/+1800
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2022-02-08 (673c1eae)
| | * | | LibArchive 2022-02-08 (673c1eae)LibArchive Upstream2022-05-2441-830/+1804
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 673c1eae896c837081a627807b9d5e990684dbf7 (v3.5.3).
| * | | | libarchive: Update script to get 3.5.3Brad King2022-05-241-1/+1
|/ / / /
* | | | Merge branch 'release-3.21' into release-3.22Brad King2022-05-190-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'vs2022-only' into release-3.21Brad King2022-05-191-0/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7282
* | \ \ \ Merge branch 'vs2022-only' into release-3.22Brad King2022-05-191-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Merge-request: !7282
| * | | | file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019Brad King2022-05-191-0/+1
| |/ / / | | | | | | | | | | | | Find MSVC tools in VS 2022 installation.
* | | | Merge branch 'FortranCInterface-gcc12' into release-3.22Brad King2022-05-161-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !7266
| * | | | FortranCInterface: Fix failure with gfortran 12 and ClangBrad King2022-05-161-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2) should only be added for the GNU C compiler. Fixes: #23500 Issue: #23123
* | | | Merge branch 'FindPkgConfig-LIBRARY_PATH' into release-3.22Brad King2022-05-121-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !7258
| * | | | FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}Brad King2022-05-121-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the ENV save/restore added by commit 36979f5b43 (FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment, 2021-07-13, v3.22.0-rc1~407^2) to unset the variable if it was originally not set. While at it, clarify the value to which we temporarily set it. The `pkg-config` and `pkgconf` tools only check that the variable is set, and do not care about the value. Set it to a more true-looking value. Issue: #22148
* | | | Merge branch 'release-3.21' into release-3.22Brad King2022-04-260-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'ci-xcode-13.3' into release-3.21Brad King2022-04-262-7/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7204
* | \ \ \ Merge branch 'ci-xcode-13.3' into release-3.22Brad King2022-04-262-6/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Merge-request: !7204
| * | | | gitlab-ci: update macOS jobs to use Xcode 13.3Brad King2022-04-251-6/+6
| | | | |
| * | | | Tests: Ignore all classes in Xcode internal objc warningsGregor Jasny2022-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Xcode on Apple Silicon warns not only about AMSupportURL classes but also many more.
| * | | | Tests: Teach RunCMake to ignore Xcode extension point warningsBrad King2022-04-251-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] Requested but did not find extension point with identifier ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | CMake 3.22.4v3.22.4Brad King2022-04-122-4/+11
| | | |
* | | | Merge branch 'xcode-pch' into release-3.22Brad King2022-04-124-5/+25
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !7166
| * | | | PCH: Fix Xcode non-pch language exclusionCristian Adam2022-04-113-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression caused by commit bbcdac4e5d (PCH: Fix all-language precompile header support in Xcode, 2021-08-07, v3.22.0-rc1~140^2). Fixes: #23138
| * | | | Tests: Ignore all classes in Xcode internal objc warningsGregor Jasny2022-04-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | Xcode on Apple Silicon warns not only about AMSupportURL classes but also many more.
* | | | Merge branch 'doc-qhelpgenerator' into release-3.22Brad King2022-04-076-10/+15
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !7150
| * | | | Utilities/Sphinx: Update qthelp generation to qhelpgeneratorBrad King2022-04-075-10/+10
| | | | | | | | | | | | | | | | | | | | `qcollectiongenerator` is deprecated in favor of `qhelpgenerator`.
| * | | | Help: Add "Updates" section header in 3.22 release notesBrad King2022-04-071-0/+5
|/ / / / | | | | | | | | | | | | | | | | This was accidentally left out in commit 1461eff899 (Help: Add missing 3.22.1 section to the release notes, 2022-01-24, v3.22.2~1^2).
* | | | Merge branch 'ci-cmake.org-help' into release-3.22Brad King2022-04-064-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !7146
| * | | | gitlab-ci: Build qthelp-format release documentation for cmake.orgBrad King2022-04-063-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Previously the qthelp-format release documentation on `cmake.org` was built manually.
| * | | | gitlab-ci: Add objects.inv to cmake.org html documentationBrad King2022-04-061-1/+0
| | | | |
* | | | | Merge branch 'ci-cmake.org-help' into release-3.22Brad King2022-04-057-36/+109
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Merge-request: !7144