Commit Graph

63710 Commits

Author SHA1 Message Date
Brad King 0f02655bb0 Merge topic 'if-check-file-permissions'
337bc5662c if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8908
2023-11-02 09:31:01 -04:00
Brad King 83a85264b4 Merge topic 'Genex-LINK_LIBRARY-updates'
1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8936
2023-11-02 09:21:10 -04:00
Brad King d63dbb21f0 Merge topic 'findwxwidgets-lexilla'
90b77e3783 FindwxWidgets: link with lexilla
f8831a0c9e FindwxWidgets: Convert include and library paths to cmake-style
d76242ed9f FindwxWidgets: Prevent searching libraries multiple times
55072adf16 FindwxWidgets: Improve linking with scintilla
c5e3d12213 FindwxWidgets: Move wx-config specific checks inside UNIX find-style
625023cace FindwxWidgets: Include hotfix number
35d90784e9 FindwxWidgets: use IN_LIST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8927
2023-11-02 09:19:40 -04:00
Kitware Robot 4d7342512c CMake Nightly Date Stamp 2023-11-02 00:01:06 -04:00
Brad King 38ddd6c2ef Merge branch 'release-3.28' 2023-11-01 13:48:15 -04:00
Brad King 2e16fca2be Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner'
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
2023-11-01 13:48:15 -04:00
Brad King 59c3ce4c83 Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner' into release-3.28
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
2023-11-01 13:48:14 -04:00
Marc Chevrier 1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms
Some declarations were inconsistent.
For example, "LINKER:-force_load <LIBRARY>" was translated to
"-Xlinker -force_load /path/to/library". The correct translation
should be "-Xlinker -force_load -Xlinker /path/to/library" because
the library is an argument to the -force_load option.
2023-11-01 17:11:37 +01:00
Brad King 40df72a64e Merge branch 'release-3.28' 2023-11-01 10:06:59 -04:00
Brad King 0deae254e0 Merge topic 'ctest-windows-color'
2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8932
2023-11-01 10:06:59 -04:00
Brad King 8b95e3ff43 Merge topic 'ctest-windows-color' into release-3.28
2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8932
2023-11-01 10:06:58 -04:00
Marc Chevrier 337bc5662c if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE.
Offers possibility to check for file or directory permissions.
2023-11-01 14:53:31 +01:00
Ben Boeckel 1f507580a1 cmGlobalGenerator: give context about module queries
Some queries are merely investigating support in order to change
behavior. Let the method know so that any internal errors can be skipped
over.
2023-11-01 09:52:13 -04:00
Ben Boeckel 889aa0354a CMP0155: ignore scanning for sources if no scanner is available
This allows for a more graceful transition for projects using C++20
without scanner support (e.g., Clang 15 or GCC 13). While newer
compilers will (needlessly) scan, it allows C++20-using projects to use
older compilers without having to set `CMAKE_CXX_SCAN_FOR_MODULES` to
support newer CMake minimum versions.

Fixes: #25357
2023-11-01 09:52:08 -04:00
Cristian Adam 2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1
Windows 10 supports ANSI colors since v1511. For earlier versions of Windows
installing ANSICON will enable ANSI colors in cmd.exe.

For those setups where the environment is set up with CLICOLOR_FORCE set
to 1 ctest should honor the setting and emit colored ANSI output.
2023-11-01 09:43:59 -04:00
Brad King 0711a81918 Merge branch 'release-3.28' 2023-11-01 09:40:46 -04:00
Brad King d662533189 Merge branch 'release-3.27' 2023-11-01 09:40:45 -04:00
Brad King e416b3122e Merge branch 'release-3.27' into release-3.28 2023-11-01 09:40:31 -04:00
Brad King 5befbdecc2 Merge branch 'release-3.28' 2023-11-01 09:40:01 -04:00
Brad King 0877babe8b Merge topic 'revert-GetPrerequisites-linux-x86'
139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8933
2023-11-01 09:40:01 -04:00
Brad King 3f7419a124 Merge topic 'revert-GetPrerequisites-linux-x86' into release-3.28
139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8933
2023-11-01 09:39:59 -04:00
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