Lephenixnoir
/
fxsdk
5
7
Fork 6
Code Issues 1 Pull Requests Releases Wiki Activity

cmake: use PkgConfig to find libpng 

The FindPNG module fails catastrophically on Mac OS because it searches
for the library and header independently, and ends up pulling a
completely unrelated header from a random framework.
This commit is contained in:
Lephenixnoir 2021-04-11 20:27:25 +02:00
parent 2c6a46963d
commit 42bc49b89a
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -6,7 +6,7 @@ project(fxSDK VERSION 2.3.1 LANGUAGES C)
option(FXLINK_DISABLE_UDISKS2 "Do not build the UDisks2-based features of fxlink")
find_package(PkgConfig REQUIRED)
find_package(PNG REQUIRED)
pkg_check_modules(libpng REQUIRED libpng16 IMPORTED_TARGET)
pkg_check_modules(libusb REQUIRED libusb-1.0 IMPORTED_TARGET)
# pkg_check_modules(libudev libudev IMPORTED_TARGET)
if(NOT FXLINK_DISABLE_UDISKS2)
@ -23,7 +23,7 @@ add_compile_options(-Wall -Wextra -std=c11 -Og -g -D_GNU_SOURCE)
add_executable(fxg1a fxg1a/dump.c fxg1a/edit.c fxg1a/file.c fxg1a/icon.c
fxg1a/main.c fxg1a/util.c)
target_include_directories(fxg1a PUBLIC fxg1a/)
target_link_libraries(fxg1a PNG::PNG)
target_link_libraries(fxg1a PkgConfig::libpng)
# fxsdk
add_custom_command(OUTPUT "${BIN}/fxsdk.sh"