Skip to content

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

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

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

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
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@)
Copy link
Member

Choose a reason for hiding this comment

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

I think we don't even need those temporary variables. Also, as said before, I'm missing some unset calls here, and I'd give the variables a prefix.

I think using boolean generator expressions, though, we don't need any of these variables:

if($<BOOL:${USE_SYSTEM_ZSYNC2}>)

The expression will be converted to an integer (0 or 1, depending on the value). The advantage of this solution is that the strings in USE_SYSTEM_ZSYNC2 will not be propagated into a file that is installed later.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The variables are not meant to be temporary. Instead a would like to inform libappimageupdate clients how it was built.

Copy link
Member

Choose a reason for hiding this comment

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

These should be documented in the README then, I guess, and maybe also in this file.

Please use the generator expressions to give the variables uniform values.

Also, please remove the underscore between AppImage and Update. The tool is called "AppImageUpdate" without a space.

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 @BUILD_QT_UI@)
if(APPIMAGE_UPDATE_QT_UI)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
endif()

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