mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 15:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,797 Commits 2 Branches 391 Tags
524205a7a520abc77283103c01e0098d2d008a8f
Commit Graph

54797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hiroshi Miura
524205a7a5 FindJasper: Modernize code layout 2021-10-06 11:20:35 -04:00
Brad King
49392b591d Merge branch 'release-3.21' 2021-10-06 10:29:00 -04:00
Brad King
50b8b509c7 Merge topic 'bootstrap-qt6' 
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
 2021-10-06 10:29:00 -04:00
Brad King
b82e7ed5eb Merge topic 'bootstrap-qt6' into release-3.21 
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
 2021-10-06 10:28:59 -04:00
Brad King
e150829045 Merge topic 'Wunused-but-set-variable' 
f4387c197d CPack/OSXX11: Fix Clang 13 Wunused-but-set-variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6595
 2021-10-06 10:27:31 -04:00
Brad King
807cff7364 Merge branch 'release-3.21' 2021-10-06 10:26:36 -04:00
Brad King
a4fbe961f8 Merge topic 'cpack-qtifw-4.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
 2021-10-06 10:26:36 -04:00
Brad King
cd51eba584 Merge topic 'cpack-qtifw-4.1' into release-3.21 
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
 2021-10-06 10:26:35 -04:00
Brad King
a2e2fd37d8 Merge branch 'release-3.21' 2021-10-06 10:25:31 -04:00
Brad King
973ccc52af Merge topic 'ci-xcode-13.0' 
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
 2021-10-06 10:25:31 -04:00
Brad King
1e3cc4b2b1 Merge topic 'ci-xcode-13.0' into release-3.21 
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
 2021-10-06 10:25:30 -04:00
Brad King
668bee3099 Merge branch 'release-3.21' 2021-10-06 10:24:16 -04:00
Brad King
434f757233 Merge topic 'xcode13-schema' 
0e86fea0be Tests: Specify destination for Xcode scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6582
 2021-10-06 10:24:16 -04:00
Brad King
5eef6ca26d Merge topic 'xcode13-schema' into release-3.21 
0e86fea0be Tests: Specify destination for Xcode scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6582
 2021-10-06 10:24:15 -04:00
Brad King
86f79694c4 Merge branch 'release-3.21' 2021-10-06 10:22:22 -04:00
Brad King
ae41e325a7 Merge topic 'ci-ctest-update' 
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
 2021-10-06 10:22:22 -04:00
Brad King
15f405cdf1 Merge topic 'ci-ctest-update' into release-3.21 
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
 2021-10-06 10:22:21 -04:00
Brad King
3afcb05480 Merge topic 'tutorial_update_step_10' 
5632933304 Tutorial: Add version update instructions to Step 10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6580
 2021-10-06 10:20:39 -04:00
Brad King
ca2bc33626 Merge topic 'find-blas-lapack-sizeof-integer' 
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
 2021-10-06 10:17:46 -04:00
Craig Scott
0c606d0c3d Merge topic 'uic-options-merge-qt6' 
2a31167955 AUTOUIC: Fix merging of --blah options not being detected for Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6588
 2021-10-06 07:08:35 -04:00
Craig Scott
9a88f5df3e Merge topic 'fetchcontent-CMAKE-vars-passthrough' 
1851aa49be FetchContent: Pass through networking-related CMAKE_... variables
96937438b7 Help: Clean up how TLS and NETRC variables are discussed
2a82bd85b6 Help: Add documentation for CMAKE_TLS_CAINFO

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6589
 2021-10-06 07:07:32 -04:00
Kitware Robot
380f9020eb CMake Nightly Date Stamp 2021-10-06 00:01:13 -04:00
Sean McBride
f4387c197d CPack/OSXX11: Fix Clang 13 Wunused-but-set-variable 
Use the success/fail flag for the function return value.
 2021-10-05 11:52:35 -04:00
Brad King
3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests 
Enable all three in Debian builds.  Leave out CVS in Fedora builds
because the cvs package was not built with `--enable-rootcommit`.
 2021-10-05 11:06:42 -04:00
Brad King
64038fd5bc Help: Add release notes for Find{BLAS,LAPACK} BLA_SIZEOF_INTEGER option 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
972489ae4e Find{BLAS,LAPACK}: Provide testing of BLA_SIZEOF_INTEGER 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
95219365ff Find{BLAS,LAPACK}: Make possible testing of ILP64 model 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
2cd94f3e57 Find{BLAS,LAPACK}: Specify integer type in tests 2021-10-05 23:41:36 +09:00
Brad King
9b69307b56 Find{BLAS,LAPACK}: De-duplicate and generalize test creation logic 
Interpret `CMake_TEST_FindBLAS` and `CMake_TEST_FindLAPACK` as a
sequence of option assignments intermixed with vendor names.
 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
91fd645d46 FindLAPACK: Stop processing if LAPACK library does not have 64-bit integer API 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
b8a3cea51f FindBLAS: Stop processing if BLAS library does not have 64-bit integer API 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
d2f5c7856f FindLAPACK: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov
50696efc64 FindBLAS: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible 2021-10-05 23:41:29 +09:00
Igor S. Gerasimov
f8079ec8d0 FindBLAS: Update Fujitsu_SSL2 2021-10-05 23:11:00 +09:00
Brad King
6458a32242 bootstrap: Enable cmake_language command to support cmake-gui with Qt 6.2 
Fixes: #22721
 2021-10-05 09:48:46 -04:00
Joseph Snyder
5632933304 Tutorial: Add version update instructions to Step 10 
Add instructions to update the cmake_minimum_required version to 3.15
just before the usage of COMPILE_LANG_AND_ID

Issue: #22663
 2021-10-05 09:22:33 -04:00
Erlend E. Aasland
5895f236ae CPack/IFW: Add support for QtIFW 4.1 
Fixes: #22722
 2021-10-05 09:18:52 -04:00
Brad King
429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0 2021-10-05 09:13:23 -04:00
Brad King
75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0 
The output of `otool -vf` now contains additional content that happens
to be matched by our architectures regex.  Make the regex more strict.
 2021-10-05 09:13:23 -04:00
Brad King
3d192b09d1 Merge topic 'runpath-install' 
8f7e98ef09 cmInstallTargetGenerator: optimize rpath adjustments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6573
 2021-10-05 09:09:09 -04:00
Brad King
8888fa5cce Merge topic 'indexurl' 
1d03aa841c Utilities/Sphinx: Print path to index.html in build output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6530
 2021-10-05 09:08:20 -04:00
Brad King
f66ad94935 Merge topic 'iar-assembly-S-extension' 
589c6c8e3f IAR: added .S extension for IAR-ASM.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6585
 2021-10-05 09:05:53 -04:00
Brad King
6fbd94cf5b Merge topic 'tutorial_update_step_11' 
6dade88d1c Tutorial: Add documentation on Package helper functions
1bf25b5b5f Tutorial: Remove information about EXPORT keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6575
 2021-10-05 09:04:37 -04:00
Brad King
77f3cdf15b Merge branch 'release-3.21' 2021-10-05 09:02:00 -04:00
Brad King
95eaadb852 Merge topic 'testdriver-old-cast-warning' 
ba54092842 TestDriver: Fix old-style-cast warning in C++ mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6590
 2021-10-05 09:02:00 -04:00
Brad King
7518fc0c31 Merge topic 'testdriver-old-cast-warning' into release-3.21 
ba54092842 TestDriver: Fix old-style-cast warning in C++ mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6590
 2021-10-05 09:01:59 -04:00
Craig Scott
1851aa49be FetchContent: Pass through networking-related CMAKE_... variables 
CMAKE_TLS_VERIFY, CMAKE_TLS_CAINFO, CMAKE_NETRC and
CMAKE_NETRC_FILE are now passed through to the underlying
ExternalProject sub-build. Previously, they were silently ignored.

Fixes: #22144
 2021-10-05 23:41:34 +11:00
Craig Scott
2a31167955 AUTOUIC: Fix merging of --blah options not being detected for Qt6 
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.
 2021-10-05 23:29:16 +11:00
Craig Scott
a31447417f Merge topic 'qt6-tests' 
a742088472 Tests: Add support for testing Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6587
 2021-10-05 08:27:02 -04:00
Gregor Jasny
0e86fea0be Tests: Specify destination for Xcode scheme 
The `Using the first of multiple matching destinations` warning
vanishes if we explicitly specify a destination.

Fixes: #22704
 2021-10-05 07:38:48 -04:00