Skip to content

Require external packages only if they are dependencies of the generated binary #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2022
Merged

Require external packages only if they are dependencies of the generated binary #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions cmake/AppImageUpdateConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
@PACKAGE_INIT@

# look up dependencies
find_package(zsync2 REQUIRED)
find_package(libappimage REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
set(APPIMAGE_UPDATE_USE_SYSTEM_ZSYNC2 @USE_SYSTEM_ZSYNC2@)
if(APPIMAGE_UPDATE_USE_SYSTEM_ZSYNC2)
find_package(zsync2 REQUIRED)
endif()

set(APPIMAGE_UPDATE_USE_SYSTEM_LIBAPPIMAGE @USE_SYSTEM_LIBAPPIMAGE@)
if(APPIMAGE_UPDATE_USE_SYSTEM_LIBAPPIMAGE)
find_package(libappimage REQUIRED)
endif()

set(APPIMAGE_UPDATE_QT_UI @APPIMAGE_UPDATE_@BUILD_QT_UI@)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is clearly broken. Also, in such a file, you should be using unset to remove the temporary variables afterwards. Code style wise, it would make sense to make those lowercase even, or add a _ prefix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that error, It seems that I'm getting a bit blind.

I thought that the variables could be useful for clients who want to know if certain feature is available.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I completely agree that this PR is useful, and I appreciate the addition. Please send a new one.

if(APPIMAGE_UPDATE_QT_UI)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/AppImageUpdateTargets.cmake")