CMake: Create a config file for use with find_package (PR #22536)
Maarten
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/22536
Commit Summary
- dc42b45 CMake: Allow to use wxLIB_TARGETS in install.cmake
- 8ea2972 CMake: Create a config file for use with find_package
- 146c186 CMake: Use CONFIG in the minimal sample
- 0e4f859 CMake: Prevent double directory separators
- f06fc78 CMake: Never use Windows path separators in install prefix
- fa1d22a CMake: Use correct INSTALL_INTERFACE include directory on Linux
File Changes
(7 files)
- M CMakeLists.txt (2)
- M build/cmake/functions.cmake (30)
- M build/cmake/install.cmake (43)
- M build/cmake/main.cmake (4)
- M build/cmake/setup.cmake (2)
- A build/cmake/wxWidgetsConfig.cmake.in (24)
- M samples/minimal/CMakeLists.txt (11)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/22536.patch
- https://github.com/wxWidgets/wxWidgets/pull/22536.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- 85ea32a CMake: Set correct variable in AppVeyor build
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 3 commits.
- 509fe46 CMake: Don't use imported target for target_include_directories
- ec397a1 CMake: Add wxWidgets_LIBRARIES to config similar to FindwxWidgets
- 01b5890 CMake: Add workaround for ALIAS with CMake older dan 3.18
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- 11690f2 CMake: Improve mapping configurations
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- ee2a30c CMake: Only map configs when Release build is available
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 4 commits.
- f540e24 Merge remote-tracking branch 'upstream/master' into cmake-config-file
- 686b070 CMake: consistent [wx_]install usage
- b838572 CMake: Only map when configs do not exist
- 6943deb CMake: Support target files of multiple builds
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 9 commits.
- efa5cfc CMake: Prevent double directory separators
- 2e2e96f CMake: Don't use Windows path separators in install prefix
- 9d75776 CMake: Consistent [wx_]install usage
- 9ffe6f5 CMake: Use correct INSTALL_INTERFACE include directory on Linux
- ef29f74 CMake: Allow to use wxLIB_TARGETS in install.cmake
- 308376d CMake: Create a config file for use with find_package
- 3d52f80 CMake: Use find_package with CONFIG mode in the minimal sample
- a175c2e CMake: Set correct variable in AppVeyor build
- b767c6b CMake: Support target files of multiple builds
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 4 commits.
- f6631a3 CMake: Create a config file for use with find_package
- 629866d CMake: Use find_package with CONFIG mode in the minimal sample
- 8181359 CMake: Set correct variable in AppVeyor build
- 978271e CMake: Support target files of multiple builds
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
Ready for review/merge.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Thanks a lot!
Should we update docs/doxygen/overviews/cmake.md to recommend using the new method?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Ian McInerney
Should we update docs/doxygen/overviews/cmake.md to recommend using the new method?
This method is only possible if the system wx library is compiled using its CMake build chain, since it requires wx to create the config files and install them. I believe many places still use the automake build system instead of the CMake-based build system (at least the Debian, Fedora and Homebrew build scripts do), which won't get the CMake config files created and installed. Adding the CONFIG flag to the find_package step on consumer applications will cause it to only look for the config files, which I think then would cause issues with locating the wx libraries for consumers using the automake-built library version (since it will skip using FindwxWidgets.cmake included with projects and CMake itself, and instead look for the non-existent config files).
The only way I can see this becoming the recommended method is if the recommended default build system for wx itself is also changed to be CMake and the packagers update to use that as well.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
After reading the docs it seems that without either MODULE or CONFIG both modes will be used, but it seems that MODULE is used first and if FindwxWidgets.cmake is found, it's probably going to result in an error even if using CONFIG would have succeeded, is this right?
So it seems like you'd actually need to use find_package(... CONFIG) first and then, if it fails, find_package(... MODULE). But this is, of course, too ugly to recommend and hence it would not be worth updating the documentation to mention it.
So, finally, let's merge this and, if there is some better way, update the docs later.
Thanks again, Maarten!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Merged #22536 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.