summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.19Brad King2021-04-011-3/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5965
* | \ \ \ Merge topic 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.20Brad King2021-04-011-3/+2
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 3f04f69733 Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5965
| * | | Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain fileBrad King2021-04-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMakeDetermineSystem` determines the host system information before loading the toolchain file. Issue: #22012
* | | | Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20Brad King2021-04-015-2/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5964
| * | | | Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compileMarc Chevrier2021-03-315-2/+31
| | | | | | | | | | | | | | | | | | | | Fixes: #22007
* | | | | Merge topic 'CUDA-device-link' into release-3.20Brad King2021-04-015-8/+72
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5962
| * | | | | CUDA Device link: Ensure all link options are correctly formattedMarc Chevrier2021-03-315-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21994
* | | | | | Merge topic 'make-fix-deps-paths' into release-3.20Brad King2021-04-011-1/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b346350af Makefiles dependencies: normalize windows paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5955
| * | | | | Makefiles dependencies: normalize windows pathsMarc Chevrier2021-03-301-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21997
* | | | | | Merge topic 'cray-version-patch' into release-3.20Brad King2021-03-311-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 258faaeef6 Cray: Detect Fortran compiler version patch level if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5957
| * | | | | | Cray: Detect Fortran compiler version patch level if availableJustin LaPolla2021-03-311-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes: #21969
* | | | | | Merge topic 'android-binutils' into release-3.20Brad King2021-03-313-50/+52
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61e6fc26bc Android: Fix search for binutils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5958
| * | | | | Android: Fix search for binutilsHaibo Huang2021-03-303-50/+52
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `CMAKE_SYSTEM_PROGRAM_PATH` in `Platform/Android-Initialize` instead of `Platform/Android` so it can be used in `CMakeFindBinUtils`. Also add the names `llvm-strip` and `llvm-ranlib` for the corresponding tools.
* | | | | Merge topic 'ninja-automoc-cycle' into release-3.20Brad King2021-03-308-20/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca7c76269b Tests: Add test for Ninja automoc dependency cyle 54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jörg Bornemann <joerg.bornemann@qt.io> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5956
| * | | | | Tests: Add test for Ninja automoc dependency cyleKyle Edwards2021-03-296-17/+51
| | | | | |
| * | | | | autogen: Don't include SKIP_AUTOMOC files in depfileKyle Edwards2021-03-292-3/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SKIP_AUTOMOC files should not be included in moc processing, which means they shouldn't be included in the depfile either. Remove them. Fixes: #21977
* | | | | Merge topic 'GNUInstallDirs-doc' into release-3.20Brad King2021-03-301-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5947
| * | | | | GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absoluteBrad King2021-03-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21991
* | | | | | Merge topic 'nmc-cc-no-output' into release-3.20Brad King2021-03-3011-2/+68
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5950
| * | | | | Ninja Multi-Config: Fix crash on custom command config with no outputBrad King2021-03-299-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With generator expressions in a custom command's `OUTPUT` and `BYPRODUCTS`, it is possible to have no outputs at all for a particular configuration. Generate no rule in this case. Fixes: #21989
| * | | | | Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja outputBrad King2021-03-292-2/+2
| |/ / / / | | | | | | | | | | | | | | | Ninja versions prior to 1.6.0 occasionally print this message.
* | | | | Merge topic 'commands-file-permissions' into release-3.20Brad King2021-03-299-44/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 769ff05483 Help: Clarify permission-related command options 900184616a Cleanup: Fix misspelt name of local C++ variable 635431a0c9 Tests: Check host platform instead of target for running stat 4ceb0ca59e Tests: Remove redundant files for configure_file() tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5945
| * | | | | Help: Clarify permission-related command optionsCraig Scott2021-03-262-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous docs did not make clear that at most only one of the three permissions-related options can be given for configure_file() or file(GENERATE) and that USE_SOURCE_PERMISSIONS is already the default behavior for these commands. Use consistent wording to refer to the input and output files for configure_file(). Add missing "versionadded" directives on some of these keywords. Use the consistent wording and keyword ordering between the configure_file(), file(GENERATE) and file(COPY) commands.
| * | | | | Cleanup: Fix misspelt name of local C++ variableCraig Scott2021-03-262-14/+14
| | | | | |
| * | | | | Tests: Check host platform instead of target for running statCraig Scott2021-03-263-7/+7
| | | | | |