nou/libXISF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Fix error with USE_BUNDLED_LIBS

Browse Source
This commit is contained in:
Dušan Poizl
2023-04-09 10:34:15 +02:00
parent ae46f09edf
commit f9731614c8
1 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+9 -11
View File
@@ -18,24 +18,23 @@ cmake_dependent_option(USE_BUNDLED_ZLIB "Use bundled Zlib" ON "USE_BUNDLED_LIBS"
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
if(USE_BUNDLED_LIBS) if(USE_BUNDLED_LZ4)
if(USE_BUNDLED_LZ4)
list(APPEND THIRD_PARTY_SRC list(APPEND THIRD_PARTY_SRC
lz4/lz4.c lz4/lz4.c
lz4/lz4.h lz4/lz4.h
lz4/lz4hc.c lz4/lz4hc.c
lz4/lz4hc.h) lz4/lz4hc.h)
list(APPEND THIRD_PARTY_INCLUDE lz4) list(APPEND THIRD_PARTY_INCLUDE lz4)
else(USE_BUNDLED_LZ4) else(USE_BUNDLED_LZ4)
pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED) pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
endif(USE_BUNDLED_LZ4) endif(USE_BUNDLED_LZ4)
if(USE_BUNDLED_PUGIXML) if(USE_BUNDLED_PUGIXML)
list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp) list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp)
list(APPEND THIRD_PARTY_INCLUDE pugixml) list(APPEND THIRD_PARTY_INCLUDE pugixml)
else(USE_BUNDLED_PUGIXML) else(USE_BUNDLED_PUGIXML)
pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED) pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED)
endif(USE_BUNDLED_PUGIXML) endif(USE_BUNDLED_PUGIXML)
if(USE_BUNDLED_ZLIB) if(USE_BUNDLED_ZLIB)
list(APPEND THIRD_PARTY_SRC list(APPEND THIRD_PARTY_SRC
zlib/adler32.c zlib/adler32.c
zlib/compress.c zlib/compress.c
@@ -56,10 +55,9 @@ if(USE_BUNDLED_LIBS)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
list(APPEND THIRD_PARTY_INCLUDE zlib) list(APPEND THIRD_PARTY_INCLUDE zlib)
else(USE_BUNDLED_ZLIB) else(USE_BUNDLED_ZLIB)
pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED) pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED)
endif(USE_BUNDLED_ZLIB) endif(USE_BUNDLED_ZLIB)
endif(USE_BUNDLED_LIBS)
add_library(XISF add_library(XISF
bytearray.cpp bytearray.cpp