summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\
| * Merge topic 'bootstrap-qt6' into release-3.21Brad King2021-10-062-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | 6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com> Merge-request: !6593
* | \ Merge topic 'bootstrap-qt6'Brad King2021-10-062-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Andrew Maclean <andrew.amaclean@gmail.com> Merge-request: !6593
| * | bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2Brad King2021-10-052-2/+3
| | | | | | | | | | | | Fixes: #22721
* | | Merge topic 'Wunused-but-set-variable'Brad King2021-10-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f4387c197d CPack/OSXX11: Fix Clang 13 Wunused-but-set-variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6595
| * | | CPack/OSXX11: Fix Clang 13 Wunused-but-set-variableSean McBride2021-10-051-1/+1
| | | | | | | | | | | | | | | | Use the success/fail flag for the function return value.
* | | | Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'cpack-qtifw-4.1' into release-3.21Brad King2021-10-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5895f236ae CPack/IFW: Add support for QtIFW 4.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Merge-request: !6592
* | \ \ \ Merge topic 'cpack-qtifw-4.1'Brad King2021-10-061-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5895f236ae CPack/IFW: Add support for QtIFW 4.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Merge-request: !6592
| * | | | CPack/IFW: Add support for QtIFW 4.1Erlend E. Aasland2021-10-051-0/+1
| | |_|/ | |/| | | | | | | | | | Fixes: #22722
* | | | Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ci-xcode-13.0' into release-3.21Brad King2021-10-063-10/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0 75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6578
* | \ \ \ Merge topic 'ci-xcode-13.0'Brad King2021-10-063-10/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0 75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6578
| * | | | gitlab-ci: update macOS jobs to use Xcode 13.0Brad King2021-10-051-6/+6
| | | | |
| * | | | Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0Brad King2021-10-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The output of `otool -vf` now contains additional content that happens to be matched by our architectures regex. Make the regex more strict.
* | | | | Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'xcode13-schema' into release-3.21Brad King2021-10-061-1/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 0e86fea0be Tests: Specify destination for Xcode scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6582
* | | | | Merge topic 'xcode13-schema'Brad King2021-10-061-1/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 0e86fea0be Tests: Specify destination for Xcode scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6582
| * | | | Tests: Specify destination for Xcode schemeGregor Jasny2021-10-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Using the first of multiple matching destinations` warning vanishes if we explicitly specify a destination. Fixes: #22704
* | | | | Merge branch 'release-3.21'Brad King2021-10-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'ci-ctest-update' into release-3.21Brad King2021-10-064-3/+20
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6596
* | | | | Merge topic 'ci-ctest-update'Brad King2021-10-064-3/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6596
| * | | | ci: Enable CTest.Update{CVS,SVN,HG} testsBrad King2021-10-054-3/+20
| |/ / / | | | | | | | | | | | | | | | | Enable all three in Debian builds. Leave out CVS in Fedora builds because the cvs package was not built with `--enable-rootcommit`.
* | | | Merge topic 'tutorial_update_step_10'Brad King2021-10-061-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5632933304 Tutorial: Add version update instructions to Step 10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6580
| * | | | Tutorial: Add version update instructions to Step 10Joseph Snyder2021-10-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions to update the cmake_minimum_required version to 3.15 just before the usage of COMPILE_LANG_AND_ID Issue: #22663
* | | | | Merge topic 'find-blas-lapack-sizeof-integer'Brad King2021-10-0614-309/+526
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64038fd5bc Help: Add release notes for Find{BLAS,LAPACK} BLA_SIZEOF_INTEGER option 972489ae4e Find{BLAS,LAPACK}: Provide testing of BLA_SIZEOF_INTEGER 95219365ff Find{BLAS,LAPACK}: Make possible testing of ILP64 model 2cd94f3e57 Find{BLAS,LAPACK}: Specify integer type in tests 9b69307b56 Find{BLAS,LAPACK}: De-duplicate and generalize test creation logic 91fd645d46 FindLAPACK: Stop processing if LAPACK library does not have 64-bit integer API b8a3cea51f FindBLAS: Stop processing if BLAS library does not have 64-bit integer API d2f5c7856f FindLAPACK: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6407
| * | | | | Help: Add release notes for Find{BLAS,LAPACK} BLA_SIZEOF_INTEGER optionBrad King2021-10-051-0/+6
| | | | | |
| * | | | | Find{BLAS,LAPACK}: Provide testing of BLA_SIZEOF_INTEGERIgor S. Gerasimov2021-10-056-4/+44
| | | | | |
| * | | | | Find{BLAS,LAPACK}: Make possible testing of ILP64 modelIgor S. Gerasimov2021-10-052-0/+10
| | | | | |
| * | | | | Find{BLAS,LAPACK}: Specify integer type in testsIgor S. Gerasimov2021-10-052-9/+14
| | | | | |
| * | | | | Find{BLAS,LAPACK}: De-duplicate and generalize test creation logicBrad King2021-10-057-118/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interpret `CMake_TEST_FindBLAS` and `CMake_TEST_FindLAPACK` as a sequence of option assignments intermixed with vendor names.
| * | | | | FindLAPACK: Stop processing if LAPACK library does not have 64-bit integer APIIgor S. Gerasimov2021-10-051-33/+51
| | | | | |
| * | | | | FindBLAS: Stop processing if BLAS library does not have 64-bit integer APIIgor S. Gerasimov2021-10-051-44/+68
| | | | | |
| * | | | | FindLAPACK: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possibleIgor S. Gerasimov2021-10-051-4/+82
| | | | | |
| * | | | | FindBLAS: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possibleIgor S. Gerasimov2021-10-051-8/+98
| | | | | |
| * | | | | FindBLAS: Update Fujitsu_SSL2Igor S. Gerasimov2021-10-051-21/+29
| | | | | |
| * | | | | FindBLAS: Update FlexiBLASIgor S. Gerasimov2021-09-221-1/+5
| | | | | |
| * | | | | FindBLAS: Update OpenBLASIgor S. Gerasimov2021-09-221-2/+6
| | | | | |
| * | | | | FindBLAS: Update FLAMEIgor S. Gerasimov2021-09-221-1/+5
| | | | | |
| * | | | | FindBLAS: Update Generic BLASIgor S. Gerasimov2021-09-221-1/+5
| | | | | |
| * | | | | FindBLAS: Move NVHPC from Generic BLASIgor S. Gerasimov2021-09-221-1/+20
| | | | | |
| * | | | | FindLAPACK: Update Generic LAPACKIgor S. Gerasimov2021-09-221-1/+4
| | | | | |
| * | | | | FindLAPACK: Update FlexiBLASIgor S. Gerasimov2021-09-221-1/+5
| | | | | |
| * | | | | FindLAPACK: Update OpenBLASIgor S. Gerasimov2021-09-221-1/+5
| | | | | |
| * | | | | FindLAPACK: Update NVHPCIgor S. Gerasimov2021-09-221-1/+6
| | | | | |
| * | | | | FindLAPACK: EML: LAPACK is in BLASIgor S. Gerasimov2021-09-221-18/+2
| | | | | |
| * | | | | FindLAPACK: IBMESSL: LAPACK is in BLASIgor S. Gerasimov2021-09-221-18/+2
| | | | | |
| * | | | | FindLAPACK: Fujitsu_SSL2: LAPACK is in BLASIgor S. Gerasimov2021-09-221-26/+3
| | | | | |
* | | | | | Merge topic 'uic-options-merge-qt6'Craig Scott2021-10-063-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a31167955 AUTOUIC: Fix merging of --blah options not being detected for Qt6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6588
| * | | | | | AUTOUIC: Fix merging of --blah options not being detected for Qt6Craig Scott2021-10-053-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When merging a new set of uic options with a base set of options, such as when a source file has a non-empty AUTOUIC_OPTIONS property, the test for whether to support options starting with two hyphens was only testing if the Qt major version was exactly 5 rather than at least 5. That had the effect of preventing such options from being merged correctly when using Qt6, so new and base options would both be present instead of the single merged option from the source file properties. Update the version check and rename function arguments to avoid misrepresenting what they mean. Note that uic accepts long option names with a single hyphen too. See Qt docs for QCommandLineParser::ParseAsLongOptions for confirmation.
generated by cgit v0.12 at 2025-03-13 04:17:56 (GMT)