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
63,739 Commits 2 Branches 401 Tags
dea37a4e7df2d433c90d78a5df303f94eeda9e0f
Commit Graph

63739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 257d6766c6 Merge branch 'revert-GetPrerequisites-linux-x86' into release-3.27 
Merge-request: !8933
 2023-11-01 09:39:44 -04:00
Maarten Bent 90b77e3783 FindwxWidgets: link with lexilla 
In wxWidgets 3.3 (development version) the Scintilla library has been
split into two components: Scintilla and Lexilla.
 2023-11-01 08:20:56 -04:00
Maarten Bent f8831a0c9e FindwxWidgets: Convert include and library paths to cmake-style 
This fixes DBG_MSG errors when a path uses \ instead of /.
 2023-11-01 08:20:46 -04:00
Maarten Bent d76242ed9f FindwxWidgets: Prevent searching libraries multiple times 
If the user has specified common libraries, remove the duplicates.
 2023-11-01 08:20:46 -04:00
Maarten Bent 55072adf16 FindwxWidgets: Improve linking with scintilla 
Treat scintilla like any other common lib. Only add it when the stc
component is specified. Add imm32 to the list of required libraries
when stc is used.

Fixes: #23519
 2023-11-01 08:20:46 -04:00
Maarten Bent c5e3d12213 FindwxWidgets: Move wx-config specific checks inside UNIX find-style 2023-11-01 08:20:25 -04:00
Maarten Bent 625023cace FindwxWidgets: Include hotfix number 
Add it to the wxWidgets_VERSION_STRING when it is not 0.
Include hotfix numbers when searching for installation paths,
for example wxWidgets-3.2.2.1.

Fixes: #24823
 2023-11-01 08:20:13 -04:00
Maarten Bent 35d90784e9 FindwxWidgets: use IN_LIST 2023-11-01 08:20:07 -04:00
Kitware Robot fdf6435427 CMake Nightly Date Stamp 2023-11-01 00:01:07 -04:00
Brad King 139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd" 
Revert commit cf2ad9995a (GetPrerequisites: Ignore relative paths
printed by ldd, 2023-02-20, v3.27.0-rc1~459^2) because it regressed
existing use cases.  We will need to find another solution to the use
case motivating the change.

Fixes: #25372
 2023-10-31 14:15:29 -04:00
Brad King 9c106e3964 Merge topic 'UseEcos-doc' 
0b95d0ca0f UseEcos: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8931
 2023-10-31 10:51:06 -04:00
權少 0b95d0ca0f UseEcos: Improve documentation formatting 2023-10-31 09:16:42 -04:00
Brad King ed21bfc05b Merge branch 'release-3.28' 2023-10-31 09:14:04 -04:00
Brad King 7b64aafd8d Merge branch 'release-3.27' 2023-10-31 09:14:02 -04:00
Brad King ff60cd6c67 Merge branch 'release-3.27' into release-3.28 2023-10-31 09:13:51 -04:00
Brad King aa7f1416f9 Merge branch 'modules-depends-via-target-objects' into release-3.27 
Merge-request: !8923
 2023-10-31 09:13:25 -04:00
Brad King 1f37678a30 Merge branch 'release-3.28' 2023-10-31 09:12:30 -04:00
Brad King 04c33e0990 Merge topic 'modules-depends-via-target-objects' 
22da18b995 Fortran: Restore support for TARGET_OBJECTS providing modules
64d9240564 cmComputeLinkInformation: skip over linking to items for object purposes
035302b7e3 cmComputeLinkDepends: also copy the target from object link items
861876b936 Tests/ObjectLibrary: fix comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8923
 2023-10-31 09:12:30 -04:00
Brad King 3a515b31b3 Merge topic 'modules-depends-via-target-objects' into release-3.28 
22da18b995 Fortran: Restore support for TARGET_OBJECTS providing modules
64d9240564 cmComputeLinkInformation: skip over linking to items for object purposes
035302b7e3 cmComputeLinkDepends: also copy the target from object link items
861876b936 Tests/ObjectLibrary: fix comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8923
 2023-10-31 09:12:28 -04:00
Brad King 48abe7ee79 Merge branch 'release-3.28' 2023-10-31 09:10:43 -04:00
Brad King 654bcace92 Merge topic 'FindFreeType-config-windows' 
0117446c97 FindFreeType: also set `FREETYPE_FOUND`
2cf2d4f7df FindFreeType: insert Freetype's location to the start
1cfc708eea FindFreeType: handle config-specific `LOCATION` settings as well
ae9890cd36 FindFreeType: consider `IMPLIB`-using platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8920
 2023-10-31 09:10:43 -04:00
Brad King d33ea3dff5 Merge topic 'FindFreeType-config-windows' into release-3.28 
0117446c97 FindFreeType: also set `FREETYPE_FOUND`
2cf2d4f7df FindFreeType: insert Freetype's location to the start
1cfc708eea FindFreeType: handle config-specific `LOCATION` settings as well
ae9890cd36 FindFreeType: consider `IMPLIB`-using platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8920
 2023-10-31 09:10:42 -04:00
Kitware Robot d1906daebf CMake Nightly Date Stamp 2023-10-31 00:01:08 -04:00
Brad King 4ca40374d6 Merge topic 'FindOpenThreads-doc' 
bc1f0f6e0f FindOpenThreads: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8929
 2023-10-30 14:22:01 -04:00
Ben Boeckel 0117446c97 FindFreeType: also set FREETYPE_FOUND 
Fixes: #25371
 2023-10-30 10:51:10 -04:00
Ben Boeckel 22da18b995 Fortran: Restore support for TARGET_OBJECTS providing modules 
Continue b665966933 (cmComputeLinkInformation: track OBJECT library
dependencies, 2023-07-22) which added explicitly listed `OBJECT`
libraries to the list of targets which the collator needs to consider.
Now also consider targets which provide objects directly to the target
via a `$<TARGET_OBJECT>` source lists.

Also add tests which use target objects directly and through an
`INTERFACE` library with target objects in its own sources.

Fixes: #25365
 2023-10-30 10:06:12 -04:00
權少 bc1f0f6e0f FindOpenThreads: Update documentation 2023-10-30 08:53:24 -04:00
Brad King 8e77c6e8ae Merge topic 'doc-fix-imported-location-ref' 
59c2143920 Help/IMPORTED_LOCATION: link to `LOCATION_<CONFIG>` docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8928
 2023-10-30 08:34:44 -04:00
Brad King 3548b92d62 Merge branch 'release-3.28' 2023-10-30 08:26:10 -04:00
Brad King 728646434f Merge topic 'cxxmodules-ninja-forced-rsp-files' 
09c962a6a4 Tests/CXXModules: test forced rsp files with ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8926
 2023-10-30 08:26:09 -04:00
Brad King 6474d5d03a Merge topic 'cxxmodules-ninja-forced-rsp-files' into release-3.28 
09c962a6a4 Tests/CXXModules: test forced rsp files with ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8926
 2023-10-30 08:26:08 -04:00
Brad King a80f44907a Merge branch 'release-3.28' 2023-10-30 08:22:18 -04:00
Brad King ea52c7bd78 Merge topic 'cmp0153-suggestion' 
d3cc815c98 CMP0153: Add suggestion to use execute_process()
8313d26198 cmState::AddDisallowedCommand(): Allow additional warning info

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !8921
 2023-10-30 08:22:17 -04:00
Brad King 9e1667e62a Merge topic 'cmp0153-suggestion' into release-3.28 
d3cc815c98 CMP0153: Add suggestion to use execute_process()
8313d26198 cmState::AddDisallowedCommand(): Allow additional warning info

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !8921
 2023-10-30 08:22:09 -04:00
Brad King 8056053f9e Merge branch 'release-3.28' 2023-10-30 08:20:17 -04:00
Brad King b96c72a8c9 Merge topic 'FindProtobuf-restore-protoc-include-path' 
d7f7bf08cd FindProtobuf: Fix protoc include path regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matias Lopez <mlopez203@bloomberg.net>
Merge-request: !8922
 2023-10-30 08:20:17 -04:00
Brad King 14563cb7dc Merge topic 'FindProtobuf-restore-protoc-include-path' into release-3.28 
d7f7bf08cd FindProtobuf: Fix protoc include path regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matias Lopez <mlopez203@bloomberg.net>
Merge-request: !8922
 2023-10-30 08:20:16 -04:00
Kitware Robot 832f548d7c CMake Nightly Date Stamp 2023-10-30 00:01:23 -04:00
Kitware Robot 76c08300ca CMake Nightly Date Stamp 2023-10-29 00:01:07 -04:00
Ben Boeckel 2cf2d4f7df FindFreeType: insert Freetype's location to the start 
This should help static builds satisfy dependencies by listing
transitive libraries after freetype's.
 2023-10-28 14:59:07 -04:00
Ben Boeckel 1cfc708eea FindFreeType: handle config-specific LOCATION settings as well 
`vcpkg` builds release and debug variants on platforms other than
Windows (which uses the `IMPLIB` properties).
 2023-10-28 14:59:07 -04:00
Ben Boeckel 59c2143920 Help/IMPORTED_LOCATION: link to LOCATION_<CONFIG> docs 2023-10-28 10:04:16 -04:00
Kitware Robot fbce5b627c CMake Nightly Date Stamp 2023-10-28 00:01:09 -04:00
Ben Boeckel 09c962a6a4 Tests/CXXModules: test forced rsp files with ninja 
Fixes: #25367
 2023-10-27 23:55:39 -04:00
Ben Boeckel 64d9240564 cmComputeLinkInformation: skip over linking to items for object purposes 
If a name is only found because it is a link entry of kind `Object`, do
not add anything to the link line.
 2023-10-27 15:52:01 -04:00
Ben Boeckel 035302b7e3 cmComputeLinkDepends: also copy the target from object link items 2023-10-27 13:25:33 -04:00
Ben Boeckel 861876b936 Tests/ObjectLibrary: fix comment 2023-10-27 13:25:33 -04:00
André Apitzsch d7f7bf08cd FindProtobuf: Fix protoc include path regression 
This was accidentally broken by commit 31adc11030 (FindProtobuf: Add
PLUGIN_OPTIONS and PROTOC_OPTIONS to protobuf_generate, 2023-06-29,
v3.28.0-rc1~409^2~2).

Fixes: #25368
 2023-10-27 11:41:28 -04:00
Kyle Edwards d3cc815c98 CMP0153: Add suggestion to use execute_process() 2023-10-27 09:43:18 -04:00
Kyle Edwards 8313d26198 cmState::AddDisallowedCommand(): Allow additional warning info 2023-10-27 09:42:53 -04:00