mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 15:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
64,297 Commits 2 Branches 390 Tags
46cd0a2acdbf02558eb5065bf4ac654c5e762a8b
Commit Graph

64297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
46cd0a2acd Merge branch 'release-3.28' 2023-12-14 10:02:50 -05:00
Brad King
32cd449eec Merge topic 'FindTIFF-pre-CMP0057' 
84930e9a4c FindTIFF: Restore support for projects that do not enable CMP0057

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9073
 2023-12-14 10:02:50 -05:00
Brad King
146c75a557 Merge topic 'FindTIFF-pre-CMP0057' into release-3.28 
84930e9a4c FindTIFF: Restore support for projects that do not enable CMP0057

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9073
 2023-12-14 10:02:49 -05:00
Brad King
84930e9a4c FindTIFF: Restore support for projects that do not enable CMP0057 
Since commit 6a3059e66f (FindTIFF: bridge `tiff-config` into
FindTIFF-compatible interface, 2023-09-14, v3.28.0-rc1~87^2) we use the
`if(IN_LIST)` test that required CMP0057.  Expand the scope over which
we enable that policy explicitly.

Issue: #25485
 2023-12-14 09:43:08 -05:00
Brad King
f1c221ee3f Merge branch 'release-3.28' 2023-12-14 09:16:30 -05:00
Brad King
01eb3f01b7 Merge topic 'FindFreetype-use-config' 
828df1d9e4 FindFreetype: Fix success message when config module is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9071
 2023-12-14 09:16:29 -05:00
Brad King
4ba15ae3f3 Merge topic 'FindFreetype-use-config' into release-3.28 
828df1d9e4 FindFreetype: Fix success message when config module is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9071
 2023-12-14 09:16:28 -05:00
Brad King
828df1d9e4 FindFreetype: Fix success message when config module is found 
Follow up commit d892dedf22 (FindFreetype: always find the config module
quietly, 2023-12-13) with a fix to the FPHSA call that reports success.

Fixes: #25485
 2023-12-14 09:06:07 -05:00
Brad King
228129946b Merge branch 'release-3.28' 2023-12-14 08:30:02 -05:00
Brad King
d4eb72a3f6 Merge topic 'FindMatlab-version' 
ef64c118de FindMatlab: Fix regression on Windows Registry lookup failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9070
 2023-12-14 08:30:02 -05:00
Brad King
3d1fbc4f6b Merge topic 'FindMatlab-version' into release-3.28 
ef64c118de FindMatlab: Fix regression on Windows Registry lookup failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9070
 2023-12-14 08:30:00 -05:00
Brad King
fbfbe959c0 Merge branch 'release-3.28' 2023-12-14 08:28:26 -05:00
Brad King
4d45fbd56a Merge topic 'Find-CONFIG-chain-fixes' 
581acbce52 FindTIFF: consider `IMPLIB`-using platforms
e8e7d9f775 FindTIFF: always find the config module quietly
a575bebf0d FindFreetype: also consider RelWithDebInfo-built libraries
d892dedf22 FindFreetype: always find the config module quietly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9068
 2023-12-14 08:28:25 -05:00
Brad King
db5716385e Merge topic 'Find-CONFIG-chain-fixes' into release-3.28 
581acbce52 FindTIFF: consider `IMPLIB`-using platforms
e8e7d9f775 FindTIFF: always find the config module quietly
a575bebf0d FindFreetype: also consider RelWithDebInfo-built libraries
d892dedf22 FindFreetype: always find the config module quietly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9068
 2023-12-14 08:28:15 -05:00
Brad King
ef64c118de FindMatlab: Fix regression on Windows Registry lookup failure 
Fix logic from commit dc9d9589e4 (FindMatlab:WIN32: return full Matlab
version when found via registry, 2023-09-14, v3.28.0-rc1~82^2~2) to
avoid assuming that a registry entry always exists and is non-empty.

Fixes: #25497
 2023-12-14 08:12:13 -05:00
Kitware Robot
889dd287d3 CMake Nightly Date Stamp 2023-12-14 00:01:05 -05:00
Ben Boeckel
581acbce52 FindTIFF: consider IMPLIB-using platforms 
Support multi-config-providing and `IMPLIB`-using deployments with the
`tiff-config` trampoline code. Follow the pattern used in `FindFreetype`
by commit ae9890cd36 (FindFreeType: consider `IMPLIB`-using platforms,
2023-10-26, v3.28.0-rc4~10^2~3).

See: #25485
 2023-12-13 13:12:45 -05:00
Ben Boeckel
e8e7d9f775 FindTIFF: always find the config module quietly 
When the config module is not present, a spurious "tiff not found" is
output before the pre-existing logic is used. Instead, silence the
module and use FPHSA to report as-if `TIFF` did the search.

Fixes: #25485
 2023-12-13 13:12:45 -05:00
Ben Boeckel
a575bebf0d FindFreetype: also consider RelWithDebInfo-built libraries 2023-12-13 13:12:45 -05:00
Ben Boeckel
d892dedf22 FindFreetype: always find the config module quietly 
When the config module is not present, a spurious "freetype not found"
is output before the pre-existing logic is used. Instead, silence the
module and use FPHSA to report as-if `Freetype` did the search.

See: #25485
 2023-12-13 11:28:18 -05:00
Brad King
f3b667527e Merge branch 'release-3.28' 2023-12-13 09:34:51 -05:00
Brad King
f522cf4546 Merge topic 'doc-xcframeworks-stubs-apple' 
e831eef933 Help: Note case where IMPORTED_IMPLIB isn't needed for (xc)frameworks
01735badee Help: XCFrameworks and stubs are supported on all Apple, not just macOS
6ac50df591 Help: Add missing versionadded directives for IMPORTED_IMPLIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9058
 2023-12-13 09:34:51 -05:00
Brad King
ef6aec22a1 Merge topic 'doc-xcframeworks-stubs-apple' into release-3.28 
e831eef933 Help: Note case where IMPORTED_IMPLIB isn't needed for (xc)frameworks
01735badee Help: XCFrameworks and stubs are supported on all Apple, not just macOS
6ac50df591 Help: Add missing versionadded directives for IMPORTED_IMPLIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9058
 2023-12-13 09:34:50 -05:00
Brad King
b59123f0c1 Merge topic 'adsp-deps' 
fccb1d3a36 ADSP: Use compiler-reported preprocessor dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9067
 2023-12-13 09:33:57 -05:00
Kitware Robot
3f1a2c8d52 CMake Nightly Date Stamp 2023-12-13 00:01:05 -05:00
Craig Scott
e831eef933 Help: Note case where IMPORTED_IMPLIB isn't needed for (xc)frameworks 2023-12-13 11:36:22 +11:00
Josh Channings
fccb1d3a36 ADSP: Use compiler-reported preprocessor dependencies 2023-12-12 17:44:25 +00:00
Brad King
a1abdfbc19 Merge branch 'release-3.28' 2023-12-12 09:58:20 -05:00
Brad King
5b4a54f4cf Merge topic 'ci-xcode-15.1' 
e2d25c6724 gitlab-ci: update macOS jobs to use Xcode 15.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9066
 2023-12-12 09:58:20 -05:00
Brad King
9f01de132e Merge topic 'ci-xcode-15.1' into release-3.28 
e2d25c6724 gitlab-ci: update macOS jobs to use Xcode 15.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9066
 2023-12-12 09:58:19 -05:00
Brad King
0ef98a6dd3 Merge topic 'xcframework-test-ios-build' 
3ff556ae41 Tests/RunCMake/XcFramework: Add iOS and iOS Simulator to .xcfw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9065
 2023-12-12 08:44:16 -05:00
Brad King
84a3e839ec Merge topic 'FindOpenGL-macOS-x11' 
1dbfe638da FindOpenGL: Document how to use macOS X11 OpenGL
a13f62427b FindOpenGL: Clarify cache entry doc strings on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9062
 2023-12-12 08:43:25 -05:00
Brad King
9642647646 Merge topic 'create_test_sourcelist-full-filepath' 
a29ca55b1f create_test_sourcelist: use the full path to the driver
609af7734f cmCreateTestSourceList: simplify string operations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9060
 2023-12-12 08:41:57 -05:00
Brad King
46c9feaec7 Merge topic 'vim-syntax' 
56fb01a176 vim: Fix syntax highlighting for bracket arguments and comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9061
 2023-12-12 08:40:56 -05:00
Brad King
00d3a4a290 Merge topic 'vim-indent' 
27bfbbc2c0 vim: add undo_indent to match upstream vim indentation scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9034
 2023-12-12 08:39:55 -05:00
Brad King
a130a7fb39 Merge branch 'release-3.28' 2023-12-12 08:36:28 -05:00
Brad King
c4a5806fd3 Merge topic 'bug/fix_cupti_regression' 
f69b9b7305 CUDAToolkit: Restore ability to find cupti headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Misha Chornyi <mchornyi@nvidia.com>
Merge-request: !9054
 2023-12-12 08:36:27 -05:00
Brad King
7cbf1f7a58 Merge topic 'bug/fix_cupti_regression' into release-3.28 
f69b9b7305 CUDAToolkit: Restore ability to find cupti headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Misha Chornyi <mchornyi@nvidia.com>
Merge-request: !9054
 2023-12-12 08:36:26 -05:00
Brad King
86b43c9d1c Merge branch 'release-3.28' 2023-12-12 08:35:07 -05:00
Brad King
532c30a654 Merge topic 'Help-create_test_sourcelist' 
464bc12bb7 Help/create_test_sourcelist: format arguments in the signature docs
131f9c9efa Help/create_test_sourcelist: add formatting markup
8540520902 Help/create_test_sourcelist: reflow prose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9059
 2023-12-12 08:35:07 -05:00
Brad King
4a194c7865 Merge topic 'Help-create_test_sourcelist' into release-3.28 
464bc12bb7 Help/create_test_sourcelist: format arguments in the signature docs
131f9c9efa Help/create_test_sourcelist: add formatting markup
8540520902 Help/create_test_sourcelist: reflow prose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9059
 2023-12-12 08:35:06 -05:00
Brad King
01937b05c4 Merge branch 'release-3.28' 2023-12-12 08:33:38 -05:00
Brad King
dbede7be7e Merge topic 'cmake-sources-no-scan' 
91b7bf59a7 cmGlobalXCodeGenerator: disable C++ module scanning for force-lang files
9e19a61ddb cmLocalGenerator: disable C++ module scanning for unity sources
fa9a72a788 cmLocalGenerator: disable C++ module scanning for copied PCH sources
e5dce1a37e cmQtAutoGenInitializer: disable C++ module scanning for autogen sources
4fd596c34c cmGeneratorTarget: disable C++ module scanning for verify targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9064
 2023-12-12 08:33:38 -05:00
Brad King
9988609c49 Merge topic 'cmake-sources-no-scan' into release-3.28 
91b7bf59a7 cmGlobalXCodeGenerator: disable C++ module scanning for force-lang files
9e19a61ddb cmLocalGenerator: disable C++ module scanning for unity sources
fa9a72a788 cmLocalGenerator: disable C++ module scanning for copied PCH sources
e5dce1a37e cmQtAutoGenInitializer: disable C++ module scanning for autogen sources
4fd596c34c cmGeneratorTarget: disable C++ module scanning for verify targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9064
 2023-12-12 08:33:36 -05:00
Kitware Robot
9be8198bcc CMake Nightly Date Stamp 2023-12-12 00:01:04 -05:00
Kyle Edwards
3ff556ae41 Tests/RunCMake/XcFramework: Add iOS and iOS Simulator to .xcfw 2023-12-11 16:41:38 -05:00
Brad King
e2d25c6724 gitlab-ci: update macOS jobs to use Xcode 15.1 2023-12-11 16:16:36 -05:00
Ben Boeckel
a29ca55b1f create_test_sourcelist: use the full path to the driver 
When using `FILE_SET` syntax, full paths to out-of-source files are
needed as they are not searched for.
 2023-12-11 12:15:28 -05:00
Ben Boeckel
609af7734f cmCreateTestSourceList: simplify string operations 
Use `cmStrCat` where possible and use character literals instead of
length-1 string literals.
 2023-12-11 12:15:28 -05:00
Randolph M. Fritz
1dbfe638da FindOpenGL: Document how to use macOS X11 OpenGL 
Dicourse-topic: https://discourse.cmake.org/t/9466
 2023-12-11 10:28:59 -05:00