Skip to content

[cmake] workaround for opensuse libpng #22389

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

Closed
linev wants to merge 1 commit into from
+10 −1
Closed

[cmake] workaround for opensuse libpng #22389

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
11 changes: 10 additions & 1 deletion cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,15 @@ if(asimage)
# This check can be added only now because of the reasons explained above, where all
# other required dependencies are checked.
ROOT_FIND_REQUIRED_DEP(PNG builtin_png)
# special check for opensuse which does not provide RelWithDebInfo for PNG
if(NOT builtin_png AND TARGET PNG::PNG)
get_target_property(PNG_RELWITHDEB_LOC PNG::PNG IMPORTED_LOCATION_RELWITHDEBINFO)
get_target_property(PNG_RELEASE_LOC PNG::PNG IMPORTED_LOCATION_RELEASE)
if(NOT PNG_RELWITHDEB_LOC AND PNG_RELEASE_LOC)
message(STATUS "PNG::PNG misses RelWithDebInfo. Use Release as fallback.")
set_target_properties(PNG::PNG PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
endif()
endif()
ROOT_FIND_REQUIRED_DEP(TIFF builtin_tiff)
endif()

Expand Down Expand Up @@ -369,7 +378,7 @@ if(asimage)
get_target_property(JPEG_LIBRARY_LOCATION JPEG::JPEG IMPORTED_LOCATION)
endif()
list(APPEND ASEXTRA_LIBRARIES JPEG::JPEG)

if(builtin_tiff)
add_subdirectory(builtins/libtiff)
get_target_property(TIFF_INCLUDE_DIR TIFF::TIFF INTERFACE_INCLUDE_DIRECTORIES)
Expand Down
Loading