mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,627 Commits 2 Branches 401 Tags
1035848e9cfcc148f99c9b6008c419b58f067d8e
Commit Graph

52627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 1035848e9c ci: Enable FindDevIL tests on Linux builds 2021-04-06 10:49:45 -04:00
Brad King be023ff4db Merge branch 'backport-ci-linux-updates' into ci-linux-updates 2021-04-06 10:49:39 -04:00
Brad King c6a45968d6 ci: Enable jq-based tests on Linux builds 2021-04-06 10:49:17 -04:00
Brad King 8ca8b74a96 ci: add jq and DevIL to Debian and Fedora base images 2021-04-06 10:49:16 -04:00
Brad King 8ddbb6851d Merge branch 'release-3.20' 2021-04-06 08:46:34 -04:00
Brad King b826393377 Merge branch 'release-3.19' 2021-04-06 08:46:32 -04:00
Brad King 11f2777c1a Merge branch 'release-3.18' 2021-04-06 08:46:30 -04:00
Brad King c80583d519 Merge branch 'release-3.19' into release-3.20 2021-04-06 08:46:21 -04:00
Brad King 4dde23c2ab Merge branch 'release-3.20' 2021-04-06 08:44:54 -04:00
Brad King 2d7e20dbbd Merge topic 'rel-file-table' 
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
 2021-04-06 08:44:54 -04:00
Brad King 2e029ec598 Merge topic 'rel-file-table' into release-3.20 
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
 2021-04-06 08:44:53 -04:00
Brad King 48f9a152bb Merge branch 'backport-3.19-rel-file-table' into release-3.19 2021-04-06 08:43:24 -04:00
Brad King ea7290a7a2 Merge branch 'release-3.18' into release-3.19 2021-04-06 08:42:54 -04:00
Brad King d0568edd40 Merge branch 'backport-3.18-rel-file-table' into release-3.18 
Merge-request: !5961
 2021-04-06 08:42:23 -04:00
Brad King f0527dee52 Merge topic 'Test_min_version' 
f6b4db365a Tests: bump cmake_minimum_required version to 2.8.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5979
 2021-04-06 08:33:54 -04:00
Brad King c41100cbb2 Merge branch 'release-3.20' 2021-04-06 08:32:35 -04:00
Brad King e061a201b6 Merge topic 'nvhpc-lib-arch' into release-3.20 
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
 2021-04-06 08:32:34 -04:00
Brad King ebc812a8d1 Merge topic 'nvhpc-lib-arch' 
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
 2021-04-06 08:32:34 -04:00
Brad King 9c43461418 Merge branch 'release-3.20' 2021-04-06 08:31:41 -04:00
Brad King 2d6a3fd626 Merge topic 'UseSWIG-policies' into release-3.20 
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
 2021-04-06 08:31:40 -04:00
Brad King 469b58e0b1 Merge topic 'UseSWIG-policies' 
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
 2021-04-06 08:31:40 -04:00
Brad King 3f402bb0e4 Merge branch 'release-3.20' 2021-04-06 08:30:37 -04:00
Brad King 03cfcfb5ad Merge topic 'FindHDF5-new-fortran-library-name' 
ff84a80b46 FindHDF5: search for the new Fortran HL library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5976
 2021-04-06 08:30:37 -04:00
Brad King c755fd166d Merge topic 'FindHDF5-new-fortran-library-name' into release-3.20 
ff84a80b46 FindHDF5: search for the new Fortran HL library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5976
 2021-04-06 08:30:36 -04:00
Brad King 392fffbd52 Merge branch 'release-3.20' 2021-04-06 08:29:36 -04:00
Brad King 5c2406b2da Merge branch 'release-3.19' into release-3.20 2021-04-06 08:29:30 -04:00
Brad King 35a5423467 Merge branch 'release-3.19' 2021-04-06 08:29:12 -04:00
Brad King 80abb2fdb5 Merge branch 'libarchive-u_char' into release-3.19 
Merge-request: !5981
 2021-04-06 08:28:38 -04:00
Brad King 12075b5a99 Merge branch 'release-3.20' 2021-04-06 08:28:23 -04:00
Brad King a4ee2b64bd Merge topic 'libarchive-u_char' into release-3.20 
a9fc751e65 libarchive: Use uint8_t instead of u_char

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5981
 2021-04-06 08:28:22 -04:00
Brad King 951c34b90e Merge topic 'libarchive-u_char' 
a9fc751e65 libarchive: Use uint8_t instead of u_char

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5981
 2021-04-06 08:28:22 -04:00
Brad King 8b6bc7e4fe Merge branch 'release-3.20' 2021-04-06 08:27:16 -04:00
Brad King 345ede9fcd Merge topic 'add_q_namespace_export_docs' into release-3.20 
3538f1c69b Help: Add Q_NAMESPACE_EXPORT to CMAKE_AUTOMOC_MACRO_NAMES default values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5982
 2021-04-06 08:27:15 -04:00
Brad King 71e887d678 Merge topic 'add_q_namespace_export_docs' 
3538f1c69b Help: Add Q_NAMESPACE_EXPORT to CMAKE_AUTOMOC_MACRO_NAMES default values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5982
 2021-04-06 08:27:15 -04:00
Kitware Robot 5160204fc2 CMake Nightly Date Stamp 2021-04-06 00:01:30 -04:00
Robert Maynard 764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 
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
 2021-04-05 17:41:10 -04:00
Robert Maynard 5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" 
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
 2021-04-05 16:40:43 -04:00
Brad King 05881c1cbe Merge branch 'backport-UseSWIG-policies' into UseSWIG-policies 2021-04-05 14:38:27 -04:00
Brad King c3d0b25514 UseSWIG: Transform swig depfile to match Ninja generator paths 
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
 2021-04-05 14:36:34 -04:00
Marc Chevrier 8c525d7e16 UseSWIG: Run using policy settings from includer 
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
 2021-04-05 14:00:03 -04:00
Brad King e17006c497 Utilities/Release: Add deprecation fields to File Table v1 
Provide a field for clients to check now so that we can deprecate
things later.
 2021-04-05 13:47:20 -04:00
Brad King 89ab613248 Utilities/Release: Update file table for 3.20.0 2021-04-05 13:47:02 -04:00
Brad King c5777e5421 Merge branch 'backport-3.19-rel-file-table' into rel-file-table 2021-04-05 13:46:35 -04:00
Brad King f9f59fb0b2 Merge branch 'release-3.19' into backport-3.19-rel-file-table 2021-04-05 13:45:08 -04:00
Brad King 30959aec8f Utilities/Release: Update file table for 3.19.3 2021-04-05 13:45:00 -04:00
Brad King d206c8f1ec Merge tag 'v3.19.3' into backport-3.19-rel-file-table 2021-04-05 13:44:49 -04:00
Brad King 004dbbaddd Utilities/Release: Update file table for 3.19.2 2021-04-05 13:44:42 -04:00
Brad King 1e3301a28c Merge tag 'v3.19.2' into backport-3.19-rel-file-table 2021-04-05 13:44:36 -04:00
Brad King 383bfbe76f Merge branch 'backport-3.18-rel-file-table' into backport-3.19-rel-file-table 2021-04-05 13:44:27 -04:00
Brad King 0237eba318 Utilities/Release: Add script to generate a table of files 
Fixes: #22002
 2021-04-05 13:43:51 -04:00