mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,330 Commits 2 Branches 401 Tags
731bdec8b9a752772e35ca9563cfcd91d53f4e49
Commit Graph

56330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 731bdec8b9 Merge topic 'vs-package-restore-docs' 
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
 2022-02-16 09:41:03 -05:00
Brad King 1c62bf6a6d Merge branch 'release-3.23' 2022-02-16 09:39:00 -05:00
Brad King 6e32d3a668 Merge topic 'doc-vs-instance-version' 
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
 2022-02-16 09:39:00 -05:00
Brad King be87b7661c Merge topic 'doc-vs-instance-version' into release-3.23 
e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6982
 2022-02-16 09:38:59 -05:00
Brad King c46ed01fa0 Merge topic 'file-download-range' 
231872ddb0 file(DOWNLOAD): Add options to download a range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6986
 2022-02-16 09:37:33 -05:00
Brad King 82acb05018 Merge topic 'LINK_LIBRARY-framework' 
a2cfa2da4f GenEx/LINK_LIBRARY: Add features for framework support on Apple
40178f3c90 cmGlobalGenerator: Add helper to split framework path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6967
 2022-02-16 09:36:38 -05:00
Kitware Robot fa8231ffac CMake Nightly Date Stamp 2022-02-16 00:01:11 -05:00
m.klimenko 231872ddb0 file(DOWNLOAD): Add options to download a range 2022-02-15 22:08:06 +03:00
Carsten Rudolph d92469e572 Help: Clarify how package resolve mode is intended to be used 
Fixes: #23223
 2022-02-15 10:20:14 -05:00
Carsten Rudolph f320a31087 cmake --build: prioritize --resolve-package-references over preset 
Fixes: #23224
 2022-02-15 10:20:02 -05:00
Brad King e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE 
Improve the documentation added by commit ec8d37b3b1 (VS: Support
version specification in CMAKE_GENERATOR_INSTANCE, 2021-10-26,
v3.23.0-rc1~452^2~1).

Fixes: #23225
 2022-02-15 10:06:12 -05:00
Brad King f76809c892 Merge topic 'cpack-rpm-component-var-off' 
114a04f89c CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6963
 2022-02-15 09:54:57 -05:00
Brad King bdc6f379e1 Merge topic 'ci-windows-no-java' 
4b90688aa0 ci: Explicitly disable Java tests on Windows with Borland and Open Watcom

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6979
 2022-02-15 09:53:55 -05:00
Brad King 65cef33578 Merge branch 'release-3.23' 2022-02-15 09:52:50 -05:00
Brad King 7eec19f469 Merge branch 'release-3.22' 2022-02-15 09:52:48 -05:00
Brad King e5a5f3b76f Merge branch 'release-3.22' into release-3.23 2022-02-15 09:52:42 -05:00
Brad King bd06dcb540 Merge branch 'release-3.23' 2022-02-15 09:50:09 -05:00
Brad King b8189b59d7 Merge topic 'FindMatlab-mcr911' 
b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6976
 2022-02-15 09:50:09 -05:00
Brad King db5b4f40c3 Merge topic 'FindMatlab-mcr911' into release-3.23 
b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6976
 2022-02-15 09:50:08 -05:00
Brad King c76e8a989c Merge branch 'release-3.23' 2022-02-15 09:48:28 -05:00
Brad King c3c6408609 Merge topic 'doc-example-package-components' 
5317015e68 Help: use package-specific var for supported component list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6975
 2022-02-15 09:48:28 -05:00
Brad King fb925e5443 Merge topic 'doc-example-package-components' into release-3.23 
5317015e68 Help: use package-specific var for supported component list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6975
 2022-02-15 09:48:27 -05:00
Brad King e01a983c98 Merge branch 'release-3.23' 2022-02-15 09:47:35 -05:00
Brad King 5b84e106e7 Merge topic 'doc-no-versioned-soname' 
3f7e6b3fd4 Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6978
 2022-02-15 09:47:35 -05:00
Brad King 9feafb36c0 Merge topic 'doc-no-versioned-soname' into release-3.23 
3f7e6b3fd4 Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6978
 2022-02-15 09:47:34 -05:00
Brad King 0a552c2298 Merge branch 'release-3.23' 2022-02-15 09:46:42 -05:00
Brad King e3503b11b8 Merge topic 'doc-export-command' 
19b273b729 Help: Organize and clarify export() command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6981
 2022-02-15 09:46:42 -05:00
Brad King 1126586f40 Merge topic 'doc-export-command' into release-3.23 
19b273b729 Help: Organize and clarify export() command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6981
 2022-02-15 09:46:41 -05:00
Marc Chevrier a2cfa2da4f GenEx/LINK_LIBRARY: Add features for framework support on Apple 2022-02-15 10:53:33 +01:00
Kitware Robot c8195636aa CMake Nightly Date Stamp 2022-02-15 00:01:11 -05:00
Brad King 19b273b729 Help: Organize and clarify export() command documentation 
Add section headers for each signature, and a synopsis linking to them.
Re-order sections to introduce the main `export(TARGETS)` functionality
before mentioning the `export(EXPORT)` shorthand, which may be confused
with `install(EXPORT)`.

Fixes: #23221
 2022-02-14 12:16:50 -05:00
Ralf Habacker 3f7e6b3fd4 Help: Document CMAKE_PLATFORM_NO_VERSIONED_SONAME 
This variable was added by commit 42f74df6d4 (Add basic Android platform
module, 2014-06-06, v3.1.0-rc1~416^2), but was not previously documented.

Fixes: #23227
 2022-02-14 10:40:48 -05:00
Brad King a16cefeafe Merge branch 'FindMatlab-mcr911' into release-3.22 
Merge-request: !6976
 2022-02-14 10:24:51 -05:00
Tom M b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 
Recent MCR versions have the following `VersionInfo.xml`:

    <version>9.11.0.1837725</version>

Fix parsing of multiple digits in the version components
so that we do not mistake this for version `9.1`.
 2022-02-14 10:23:33 -05:00
Connor Imes 5317015e68 Help: use package-specific var for supported component list 
Always using `_supported_components` causes conflicts when transitive
dependencies also set this variable, e.g., because the developers
followed these code samples.

An even more general approach could be to set
`_${CMAKE_FIND_PACKAGE_NAME}_supported_components` instead, but such a
change should then be applied to other variables for consistency.

Fixes: #23112
 2022-02-14 10:16:52 -05:00
Brad King 4b90688aa0 ci: Explicitly disable Java tests on Windows with Borland and Open Watcom 
Extend the change from commit 840fa28d3d (ci: Explicitly disable Java
tests on Windows, 2021-12-16) to cover Borland and Open Watcom builds.
 2022-02-14 10:11:49 -05:00
Brad King 2ac3db2d42 Merge topic 'vs-zero_check-proj' 
925da7d428 VS: Write ZERO_CHECK.proj for VS19 and above
11b8366e55 VS: Introduce IsInSolution to check whether a target is in sln file
0682cd3657 VS: Add proj as a project type to VsProjectType
6ab2c40c17 cmGlobalVisualStudio7Generator: Drop unused method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6891
 2022-02-14 10:03:50 -05:00
Brad King 7e27ee1585 Merge branch 'release-3.23' 2022-02-14 10:00:45 -05:00
Brad King c033892e07 Merge topic 'doc-debug-find-pkg-var' 
8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name
546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6977
 2022-02-14 10:00:45 -05:00
Brad King ba1f706768 Merge topic 'doc-debug-find-pkg-var' into release-3.23 
8efd4b5378 cmake::GetDebugFindPkgOutput: Use consistent argument name
546922a57b Help: Fix typo and improve docs for --debug-find-pkg|var options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6977
 2022-02-14 10:00:44 -05:00
Brad King 6e08cd438e Merge branch 'release-3.23' 2022-02-14 09:59:46 -05:00
Brad King 1435d9f899 Merge topic 'FortranCInterface-macos-arch' 
58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6974
 2022-02-14 09:59:46 -05:00
Brad King 59da8629cc Merge topic 'FortranCInterface-macos-arch' into release-3.23 
58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6974
 2022-02-14 09:59:45 -05:00
Brad King 6a84e043db Merge branch 'release-3.23' 2022-02-14 09:58:01 -05:00
Brad King ec92b6dd14 Merge topic 'GoogleTest-discovery-fix-escaping' 
61929f936f GoogleTest: Fix escaping in test names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6965
 2022-02-14 09:58:01 -05:00
Brad King 2adea60f45 Merge topic 'GoogleTest-discovery-fix-escaping' into release-3.23 
61929f936f GoogleTest: Fix escaping in test names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6965
 2022-02-14 09:58:00 -05:00
Brad King 2fa4395bf3 Merge branch 'release-3.23' 2022-02-14 09:49:12 -05:00
Brad King 78499e67e5 Merge branch 'release-3.22' 2022-02-14 09:49:10 -05:00
Brad King d53f3b91fd Merge branch 'release-3.22' into release-3.23 2022-02-14 09:49:04 -05:00
Brad King e6e9c8e484 Merge branch 'restore-target-export-includes' into release-3.22 
Merge-request: !6969
 2022-02-14 09:48:10 -05:00