cmake: fix CMake 4 and include install paths#4
Open
Old-Ding wants to merge 1 commit into
Open
Conversation
Raise the CMake minimum to 3.5 so CMake 4.x can configure the project, and use WEBOS_INSTALL_INCLUDEDIR as a CMake variable in install() rules instead of the pkg-config template placeholder syntax. Fixes webosose#2 Generated-by: OpenAI Codex Signed-off-by: aineoae86-sys <ai.neo.ae86@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2.
Summary
@WEBOS_INSTALL_INCLUDEDIR@with${WEBOS_INSTALL_INCLUDEDIR}in ordinaryinstall()commands.pc.inplaceholders unchanged, because those are template files and should still use@...@Verification
CMAKE_POLICY_VERSION_MINIMUM=3.5override and the official webOS module:BUILD_PRIVATE=ONconfigured and installedPmLogLibPrv.hto<WEBOS_INSTALL_ROOT>/usr/includeSHIP_HEADERS_ONLY=ONconfigured and installedPmLogLib.handPmLogMsg.hto<WEBOS_INSTALL_ROOT>/usr/include@WEBOS_INSTALL_INCLUDEDIR@PmLogLib-private.pcandPmLogLib-headers.pcretain correctly expanded pkg-config pathscxx/CMakeLists.txtin a target-only harness with the existingcmake-modules-webos#3head; its generated install script placesPmLog.hin<WEBOS_INSTALL_ROOT>/usr/include, andPmLogLibCpp.pchas the same includedirgit diff --checkgit ls-files --eol CMakeLists.txt cxx/CMakeLists.txtDependency note
A full unmodified CMake 4 configure currently stops in
cmake-modules-webos/webOS/webOS.cmake, which still declares CMake 2.8.7. That dependency is tracked bywebosose/cmake-modules-webos#2; its open PR #3 also fixes the later CMake 4 rejection of reading a build target'sLOCATION. This PR does not duplicate those dependency fixes. The full library build additionally requires the webOSglib-2.0andpbnjson_cdevelopment environment.