fix: update lxqt-build-tools package handling for compatibility with …#1130
Merged
deepin-bot[bot] merged 1 commit intoCodeya-IDE:masterfrom Nov 6, 2025
Merged
fix: update lxqt-build-tools package handling for compatibility with …#1130deepin-bot[bot] merged 1 commit intoCodeya-IDE:masterfrom
deepin-bot[bot] merged 1 commit intoCodeya-IDE:masterfrom
Conversation
…different versions Log: Change-Id: I2d259541537474af7e422f610943ac6efdb4a1d6
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deepin-mozart The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideUpdate the CMake dependency resolution to first attempt locating the newer lxqt2-build-tools package before falling back to the legacy lxqt-build-tools, ensuring compatibility across LXQt versions. Flow diagram for updated lxqt-build-tools package resolution logicflowchart TD
A["Start CMake configuration"] --> B["Attempt to find lxqt2-build-tools"]
B -->|Found| C["Use lxqt2-build-tools"]
B -->|Not Found| D["Attempt to find lxqt-build-tools"]
D -->|Found| E["Use lxqt-build-tools"]
D -->|Not Found| F["CMake error: Required package not found"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
deepin pr auto review我来对这个 CMakeLists.txt 的修改进行审查:
改进建议:
else()
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
message(STATUS "Found lxqt-build-tools package (legacy version)")
endif()
if(lxqt2-build-tools_FOUND)
set(LXQT_BUILD_TOOLS_PACKAGE "lxqt2-build-tools")
message(STATUS "Found lxqt2-build-tools package")
else()
set(LXQT_BUILD_TOOLS_PACKAGE "lxqt-build-tools")
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
message(STATUS "Found lxqt-build-tools package")
endif()
function(find_lxqt_build_tools)
find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} QUIET)
if(lxqt2-build-tools_FOUND)
message(STATUS "Found lxqt2-build-tools package")
else()
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
message(STATUS "Found lxqt-build-tools package")
endif()
endfunction()总的来说,这是一个很好的修改,解决了不同版本 lxqt-build-tools 包名兼容性的问题,代码质量较高,只需要一些小的改进来提升可维护性和用户体验。 |
Contributor
Author
|
/forcemerge |
|
This pr force merged! (status: blocked) |
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
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.
…different versions
Log:
Change-Id: I2d259541537474af7e422f610943ac6efdb4a1d6
Summary by Sourcery
Adapt CMake configuration to detect and use either the new lxqt2-build-tools package or the traditional lxqt-build-tools package to maintain compatibility across LXQt versions
Bug Fixes:
Enhancements: