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
65,311 Commits 2 Branches 401 Tags
f968d21e956698d7bc8fc6b81a35536df3eb05af
Commit Graph

65311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King d42a2accf6 Merge topic 'ci-windows-no-java' 
2c324f2ea2 ci: Explicitly disable Java tests on more Windows jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9302
 2024-03-04 10:23:04 -05:00
Brad King 0719320d21 Merge branch 'release-3.29' 2024-03-04 10:21:39 -05:00
Brad King 372e25f081 Merge branch 'release-3.28' 2024-03-04 10:21:38 -05:00
Brad King 68240e7e49 Merge branch 'release-3.28' into release-3.29 2024-03-04 10:21:32 -05:00
Brad King f19c28e1be Merge branch 'release-3.29' 2024-03-04 10:20:49 -05:00
Brad King 4feab44829 Merge topic 'cxxmodules-invalid-iterator' 
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9303
 2024-03-04 10:20:48 -05:00
Brad King 37ddb04738 Merge topic 'cxxmodules-invalid-iterator' into release-3.29 
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9303
 2024-03-04 10:20:47 -05:00
Brad King 944f10d768 Merge topic 'cxxmodules-invalid-iterator' into release-3.28 
844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9303
 2024-03-04 10:19:34 -05:00
Alex Richardson da5de7f9f3 bootstrap: Allow --boostrap-system-* libraries custom prefixes 
If pkg-config is available, we can query it for the correct -l/-L flags.
This fixes the --boostrap-libuv build for me with libuv installed into
$HOME and PKG_CONFIG_PATH set appropriately
 2024-03-03 23:08:35 -08:00
Kitware Robot debf777290 CMake Nightly Date Stamp 2024-03-04 00:02:49 -05:00
Kitware Robot e1cca0cb9e CMake Nightly Date Stamp 2024-03-03 00:01:09 -05:00
Kitware Robot f3204de7b6 CMake Nightly Date Stamp 2024-03-02 00:01:20 -05:00
Ben Boeckel 844f054fe0 cmImportedCxxModuleInfo: remove unused pointer field 
Also avoids usage of an invalid `importit` when module names are not
available.
 2024-03-01 11:23:44 -05:00
Brad King 2c324f2ea2 ci: Explicitly disable Java tests on more Windows jobs 
Extend the change from commit 840fa28d3d (ci: Explicitly disable Java
tests on Windows, 2021-12-16, v3.22.2~17^2) to cover NMake, JOM, and
Ninja Multi-Config jobs.
 2024-03-01 09:06:40 -05:00
Brad King 43daf8adaa Merge branch 'release-3.29' 2024-03-01 09:01:07 -05:00
Brad King e1f74efd87 Merge branch 'release-3.28' 2024-03-01 09:01:00 -05:00
Brad King 4c0ea43c09 Merge branch 'release-3.28' into release-3.29 2024-03-01 09:00:38 -05:00
Brad King 2c72e6ebb4 Merge branch 'release-3.29' 2024-03-01 08:59:51 -05:00
Brad King eafeb52d48 Merge topic 'FindTIFF-cmake-package' 
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
 2024-03-01 08:59:51 -05:00
Brad King e80ad5809b Merge topic 'FindTIFF-cmake-package' into release-3.29 
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
 2024-03-01 08:59:50 -05:00
Brad King d16ac6f801 Merge topic 'FindTIFF-cmake-package' into release-3.28 
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9300
 2024-03-01 08:59:04 -05:00
Brad King 4f5322d18f Merge topic 'ExternalProject-TLS_VERSION' 
2ef3bd9186 ExternalProject: Add TLS version options for https connections
f0a36b1a76 ExternalProject: Factor out helper to get NETRC options
019960a52a ExternalProject: Factor out helper to get TLS_CAINFO option
1afa6f359e ExternalProject: Factor out helper to get TLS_VERIFY option
e39c37ab29 ExternalProject: Revise wording of TLS_VERIFY documentation
fe5e6c27bd ExternalProject: Prepare for multiple git submodule config options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !9296
 2024-03-01 08:58:22 -05:00
Brad King 4d0680b061 Merge topic 'ci-vs-android' 
71fea8fbf5 ci: Enable VSAndroid test in VS 2022 nightly job
85b28c8f83 ci: Enable VSAndroid test in VS 2019 nightly job
f2092b02d5 Tests/VSAndroid: Update for VS 17
a0f85760ac gitlab-ci: add rules to suppress jobs in a nightly pipeline schedule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9301
 2024-03-01 08:48:38 -05:00
Kitware Robot 2bd9ea9acb CMake Nightly Date Stamp 2024-03-01 00:01:16 -05:00
Brad King 71fea8fbf5 ci: Enable VSAndroid test in VS 2022 nightly job 2024-02-29 13:58:42 -05:00
Brad King 85b28c8f83 ci: Enable VSAndroid test in VS 2019 nightly job 2024-02-29 13:58:16 -05:00
Brad King f2092b02d5 Tests/VSAndroid: Update for VS 17 2024-02-29 11:59:05 -05:00
Brad King a0f85760ac gitlab-ci: add rules to suppress jobs in a nightly pipeline schedule 2024-02-29 11:59:05 -05:00
Brad King b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package 
Since commit 6a3059e66f (FindTIFF: bridge `tiff-config` into
FindTIFF-compatible interface, 2023-09-14, v3.28.0-rc1~87^2)
we try to find the upstream TIFF cmake package.  However, it
is called `TiffConfig.cmake`, not `tiff-config.cmake`, so we
need to match the capitalization of the package name.
 2024-02-29 08:47:53 -05:00
Brad King a50982b637 Merge topic 'cpack-path-simplify' 
023720e10a cpack: Simplify config file selection
cc3c603061 cpack: Simplify package directory selection logic
a9ad70de76 Source: Avoid using CollapseFullPath just to get parent directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9294
 2024-02-29 08:07:24 -05:00
Brad King 21055d6d46 Merge branch 'release-3.29' 2024-02-29 08:05:45 -05:00
Brad King b9bd53620d Merge branch 'release-3.28' 2024-02-29 08:05:43 -05:00
Brad King 966e6afd36 Merge branch 'release-3.28' into release-3.29 2024-02-29 08:05:33 -05:00
Brad King 7472d05394 Merge branch 'release-3.29' 2024-02-29 08:02:29 -05:00
Brad King 9c69bd8d42 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' 
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths'
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9295
 2024-02-29 08:02:29 -05:00
Brad King cb2dc012c0 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' into release-3.29 
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths'
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9295
 2024-02-29 08:02:28 -05:00
Brad King 81a8cf2410 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' into release-3.28 
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9295
 2024-02-29 08:01:22 -05:00
Brad King 22b4be27f2 Merge branch 'release-3.29' 2024-02-29 07:59:28 -05:00
Brad King 7d1aae7a60 Merge topic 'Help-add_custom_command-grammo' 
b03356f954 Help/add_custom_command: fix verb grammo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9297
 2024-02-29 07:59:28 -05:00
Brad King 8a0d42d15e Merge topic 'Help-add_custom_command-grammo' into release-3.29 
b03356f954 Help/add_custom_command: fix verb grammo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9297
 2024-02-29 07:59:27 -05:00
Kitware Robot 76b0e21848 CMake Nightly Date Stamp 2024-02-29 00:01:13 -05:00
Brad King 2ef3bd9186 ExternalProject: Add TLS version options for https connections 
Add a `TLS_VERSION` option and honor `CMAKE_TLS_VERSION` variables.
Also map the version to Git options as we already do for `TLS_VERIFY`.

Issue: #25701
 2024-02-28 19:11:29 -05:00
Brad King f0a36b1a76 ExternalProject: Factor out helper to get NETRC options 2024-02-28 19:10:29 -05:00
Brad King 019960a52a ExternalProject: Factor out helper to get TLS_CAINFO option 2024-02-28 19:02:51 -05:00
Brad King 1afa6f359e ExternalProject: Factor out helper to get TLS_VERIFY option 2024-02-28 18:57:47 -05:00
Brad King de02dcd749 Merge branch 'release-3.29' 2024-02-28 15:02:54 -05:00
Brad King 1b401cbbb1 Merge branch 'release-3.28' 2024-02-28 15:02:52 -05:00
Brad King d00af79a7f Merge branch 'release-3.28' into release-3.29 2024-02-28 15:02:36 -05:00
Brad King dc81ed8f52 Merge branch 'release-3.29' 2024-02-28 15:01:37 -05:00
Brad King 2c05cf13e4 Merge topic 'test-cxxmodules-vs' 
6925978f3e Tests/RunCMake/CXXModules: Update VS circular error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9299
 2024-02-28 15:01:37 -05:00