summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: add support for --toolchain command argumentRobert Maynard2021-04-1516-3/+63
|
* CMAKE_TOOLCHAIN_FILE: Document relative path behaviorRobert Maynard2021-04-151-0/+3
|
* Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\
| * Merge branch 'release-3.19' into release-3.20Brad King2021-04-060-0/+0
| |\
* | \ Merge branch 'release-3.19'Brad King2021-04-060-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'backport-3.19-rel-file-table' into release-3.19Brad King2021-04-064-20/+64
| |\ \
| * \ \ Merge branch 'release-3.18' into release-3.19Brad King2021-04-0610-0/+409
| |\ \ \
* | \ \ \ Merge branch 'release-3.18'Brad King2021-04-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'backport-3.18-rel-file-table' into release-3.18Brad King2021-04-0610-0/+409
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5961
* | \ \ \ \ Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'rel-file-table' into release-3.20Brad King2021-04-0610-0/+473
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e17006c497 Utilities/Release: Add deprecation fields to File Table v1 89ab613248 Utilities/Release: Update file table for 3.20.0 c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table 30959aec8f Utilities/Release: Update file table for 3.19.3 d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table 004dbbaddd Utilities/Release: Update file table for 3.19.2 1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5961
* | \ \ \ \ \ Merge topic 'rel-file-table'Brad King2021-04-069-0/+468
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e17006c497 Utilities/Release: Add deprecation fields to File Table v1 89ab613248 Utilities/Release: Update file table for 3.20.0 c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table 30959aec8f Utilities/Release: Update file table for 3.19.3 d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table 004dbbaddd Utilities/Release: Update file table for 3.19.2 1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5961
| * | | | | | Utilities/Release: Add deprecation fields to File Table v1Brad King2021-04-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a field for clients to check now so that we can deprecate things later.
| * | | | | | Utilities/Release: Update file table for 3.20.0Brad King2021-04-053-23/+23
| | | | | | |
| * | | | | | Merge branch 'backport-3.19-rel-file-table' into rel-file-tableBrad King2021-04-0510-0/+453
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'release-3.19' into backport-3.19-rel-file-tableBrad King2021-04-0568-187/+591
| | |\ \ \ \ \
| | * | | | | | Utilities/Release: Update file table for 3.19.3Brad King2021-04-054-6/+48
| | | | | | | |
| | * | | | | | Merge tag 'v3.19.3' into backport-3.19-rel-file-tableBrad King2021-04-0545-95/+723
| | |\ \ \ \ \ \
| | * | | | | | | Utilities/Release: Update file table for 3.19.2Brad King2021-04-054-18/+20
| | | | | | | | |
| | * | | | | | | Merge tag 'v3.19.2' into backport-3.19-rel-file-tableBrad King2021-04-05207-602/+1642
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'backport-3.18-rel-file-table' into backport-3.19-rel-file-tableBrad King2021-04-0510-0/+409
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Utilities/Release: Add script to generate a table of filesBrad King2021-04-059-0/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22002
| | | * | | | | | | Tests: Add RunCMake helper to run a plain scriptBrad King2021-03-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many tests covering CMake scripting commands can work without initializing a full generator.
* | | | | | | | | | Merge topic 'Test_min_version'Brad King2021-04-0665-66/+66
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6b4db365a Tests: bump cmake_minimum_required version to 2.8.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5979
| * | | | | | | | | | Tests: bump cmake_minimum_required version to 2.8.12Rolf Eike Beer2021-04-0565-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needlessly produces warnings during the test runs that no-one sees but that are distracting when actually inspecting the logs.
* | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'nvhpc-lib-arch' into release-3.20Brad King2021-04-0627-38/+164
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5984
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'nvhpc-lib-arch'Brad King2021-04-0627-38/+164
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5984
| * | | | | | | | | | | CMakeDetermineCompilerABI: Extract lib arch from implicit object file pathsRobert Maynard2021-04-0514-16/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVHPC compiler does not have any implicit link directories that can be used to detect `CMAKE_LIBRARY_ARCHITECTURE`, but it does have implicit object files. Extract implicit object file paths from link lines and check them for the `CMAKE_LIBRARY_ARCHITECTURE` pattern. Issue: #22024
| * | | | | | | | | | | CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"Robert Maynard2021-04-0521-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 657fc3a9a7 (CMakeDetermineCompilerABI: Parse library arch from versioned paths, 2021-02-03, v3.20.0-rc1~40^2) caused `CMAKE_LIBRARY_ARCHITECTURE` to be populated on non-multiarch platforms if their compilers happen to use `$arch/$version` library directories. Revert the use of versioned library paths. Fixes: #22024
* | | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'UseSWIG-policies' into release-3.20Brad King2021-04-061-15/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d0b25514 UseSWIG: Transform swig depfile to match Ninja generator paths 8c525d7e16 UseSWIG: Run using policy settings from includer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5983
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'UseSWIG-policies'Brad King2021-04-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05881c1cbe Merge branch 'backport-UseSWIG-policies' into UseSWIG-policies c3d0b25514 UseSWIG: Transform swig depfile to match Ninja generator paths 8c525d7e16 UseSWIG: Run using policy settings from includer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5983
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-UseSWIG-policies' into UseSWIG-policiesBrad King2021-04-051-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | UseSWIG: Transform swig depfile to match Ninja generator pathsBrad King2021-04-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 89b01b04fa (UseSWIG: use swig tool to generate dependencies, 2021-01-12, v3.20.0-rc1~120^2) we use a tool-provided depfile to extract dependencies under the Ninja generator. Enable `CMP0116` to ensure depfile paths are translated to match what the Ninja generator writes to the build manfiest. Fixes: #22029
| | * | | | | | | | | | | | UseSWIG: Run using policy settings from includerMarc Chevrier2021-04-051-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport commit de7f0aa6c0 (UseSWIG: avoid spurious policy warnings, 2021-02-11) to the 3.20 release branch. Projects need to be able to control policies. Issue: #22029
* | | | | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge topic 'FindHDF5-new-fortran-library-name' into release-3.20Brad King2021-04-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff84a80b46 FindHDF5: search for the new Fortran HL library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5976
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'FindHDF5-new-fortran-library-name'Brad King2021-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff84a80b46 FindHDF5: search for the new Fortran HL library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5976
| * | | | | | | | | | | | | | FindHDF5: search for the new Fortran HL library nameBen Boeckel2021-04-051-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDF5 1.10.6 renamed this library to match the other language binding library names. Fixes: #20205
* | | | | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'release-3.19'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'libarchive-u_char' into release-3.19Brad King2021-04-061-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5981
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge topic 'libarchive-u_char' into release-3.20Brad King2021-04-061-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fc751e65 libarchive: Use uint8_t instead of u_char Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5981
* | | | | | | | | | | | | | | Merge topic 'libarchive-u_char'Brad King2021-04-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fc751e65 libarchive: Use uint8_t instead of u_char Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5981
| * | | | | | | | | | | | | | libarchive: Use uint8_t instead of u_charBrad King2021-04-051-4/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is not a standard type. Fixes: #22013
* | | | | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge topic 'add_q_namespace_export_docs' into release-3.20Brad King2021-04-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3538f1c69b Help: Add Q_NAMESPACE_EXPORT to CMAKE_AUTOMOC_MACRO_NAMES default values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5982