summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'binutils-var-private' into release-3.20Brad King2021-04-071-10/+10
|\ | | | | | | | | | | | | 4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5986
| * BinUtils: Avoid clobbering a variable named without a private prefixBrad King2021-04-071-10/+10
| | | | | | | | | | | | | | | | | | Refactoring in commit b12aec6c8d (BinUtils: prefer bin utils matching the compiler version extension, 2020-12-11, v3.20.0-rc1~171^2) accidentally leaked a `TOOL` variable. Name temporary variables with a private prefix. Fixes: #22035
* | Merge topic 'ios-rpath-linker-flag' into release-3.20Brad King2021-04-074-9/+13
|\ \ | | | | | | | | | | | | | | | | | | 4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5980
| * | Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS tooCraig Scott2021-04-064-9/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake 3.19, we no longer support macOS SDKs older than 10.5, which corresponds to Xcode 3. Supporting older Xcode versions for device platforms is also not realistic. We therefore expect the -rpath linker option should always be supported now. When targeting iOS, tvOS or watchOS, the previous disabling of -rpath support meant that the install_name_dir of shared libraries and frameworks was unable to use @rpath. This resulted in embedding absolute paths for their install_name. When they were embedded in an app bundle, this would cause the app to fail at runtime. By enabling the -rpath linker option, the default install_name_dir is now @rpath for these platforms, which results in binaries that do work at runtime. Fixes: #20036
* | Merge branch 'release-3.19' into release-3.20Brad King2021-04-060-0/+0
|\ \
| * | CMake 3.19.8v3.19.8Brad King2021-04-061-1/+1
| | |
* | | Merge topic 'ci-linux-updates' into release-3.20Brad King2021-04-067-3/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6a45968d6 ci: Enable jq-based tests on Linux builds 8ca8b74a96 ci: add jq and DevIL to Debian and Fedora base images Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5987
| * | | ci: Enable jq-based tests on Linux buildsBrad King2021-04-063-0/+3
| | | |
| * | | ci: add jq and DevIL to Debian and Fedora base imagesBrad King2021-04-064-3/+15
|/ / /
* | | Merge branch 'release-3.19' into release-3.20Brad 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 'backport-3.18-rel-file-table' into release-3.18Brad King2021-04-0610-0/+409
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5961
* | | \ \ \ 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
| * | | | | | 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 '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
| * | | | | | | | | | 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 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
| * | | | | | | | | | | 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 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
| * | | | | | | | | | | 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.19' into release-3.20Brad King2021-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'libarchive-u_char' into release-3.19Brad King2021-04-061-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5981
* | \ \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | libarchive: Use uint8_t instead of u_charBrad King2021-04-051-4/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is not a standard type. Fixes: #22013
* | | | | | | | | | | 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
| * | | | | | | | | | Help: Add Q_NAMESPACE_EXPORT to CMAKE_AUTOMOC_MACRO_NAMES default valuesAlexander Neumann2021-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 426941c433 (Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC, 2020-02-26, v3.17.0-rc2~3^2).
* | | | | | | | | | | Merge topic 'doc-imported-soname' into release-3.20Brad King2021-04-051-6/+18
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d6e899578 Help: Document in add_library how to import libraries with SONAME Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5975
| * | | | | | | | | | Help: Document in add_library how to import libraries with SONAMEBrad King2021-04-021-6/+18
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `add_library` to create an `IMPORTED` library target, there are a few target properties that are essential to correctly tell CMake about the library file. We already cover `IMPORTED_LOCATION` and `IMPORTED_IMPLIB`. Add `IMPORTED_SONAME` and `IMPORTED_NO_SONAME`, which are important in certain cases. Fixes: #22016
* | | | | | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-04-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ci-test-ext-done' into release-3.19Brad King2021-04-021-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5971
* | \ \ \ \ \ \ \ \ \ Merge topic 'ci-test-ext-done' into release-3.20Brad King2021-04-021-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7829136a6f gitlab-ci: Tell CDash when a test-ext job is done Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5971
| * | | | | | | | | | gitlab-ci: Tell CDash when a test-ext job is doneBrad King2021-04-021-0/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These jobs are self-contained and so can be re-run on their own to produce a whole new submission to CDash. Tell CDash when each submission is done so re-running a job replaces results rather than accumulating them.
* | | | | | | | | | Merge topic 'doc-IMPORTED_LOCATION' into release-3.20Brad King2021-04-021-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08a25e4902 Help: Clarify IMPORTED_LOCATION documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5968
| * | | | | | | | | | Help: Clarify IMPORTED_LOCATION documentationmcc2021-04-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer the macOS term "application bundle" over just "bundle". Put both macOS cases together.
* | | | | | | | | | | Merge topic 'FindMPI-host_link' into release-3.20Brad King2021-04-021-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 666f689e48 FindMPI: avoid host link options to be propagated to device link step Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !5966
| * | | | | | | | | | FindMPI: avoid host link options to be propagated to device link stepMarc Chevrier2021-04-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21887
* | | | | | | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-04-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |