Changeset View
Changeset View
Standalone View
Standalone View
devel/axmldec/files/patch-CMakeLists.txt
| --- CMakeLists.txt.orig 2017-05-07 19:44:44 UTC | --- CMakeLists.txt.orig 2017-05-07 19:44:44 UTC | ||||
| +++ CMakeLists.txt | +++ CMakeLists.txt | ||||
| @@ -61,23 +61,17 @@ add_definitions( | @@ -61,23 +61,17 @@ add_definitions( | ||||
| target_link_libraries(axmldec ${Boost_LIBRARIES}) | target_link_libraries(axmldec ${Boost_LIBRARIES}) | ||||
| if(ENABLE_APK_LOADING) | if(ENABLE_APK_LOADING) | ||||
| - find_package(ZLIB REQUIRED) | - find_package(ZLIB REQUIRED) | ||||
| - include_directories(${ZLIB_INCLUDE_DIR}) | - include_directories(${ZLIB_INCLUDE_DIR}) | ||||
| - | - | ||||
| + include (FindPkgConfig) | + include (FindPkgConfig) | ||||
| + if (PKG_CONFIG_FOUND) | + if (PKG_CONFIG_FOUND) | ||||
| + pkg_check_modules(MINIZIP minizip) | + pkg_check_modules(MINIZIP minizip-ng) | ||||
| + endif() | + endif() | ||||
| + include_directories(${MINIZIP_INCLUDE_DIRS}) | + include_directories(${MINIZIP_INCLUDE_DIRS}) | ||||
| + find_library(MINIZIP_FROM_PORTS ${MINIZIP_LIBRARIES} | + find_library(MINIZIP_FROM_PORTS ${MINIZIP_LIBRARIES} | ||||
| + PATHS ${MINIZIP_LIBRARY_DIRS}) | + PATHS ${MINIZIP_LIBRARY_DIRS}) | ||||
| add_definitions( | add_definitions( | ||||
| -DENABLE_APK_LOADING=1 | -DENABLE_APK_LOADING=1 | ||||
| ) | ) | ||||
| - add_library(minizip STATIC | - add_library(minizip STATIC | ||||
| Show All 14 Lines | |||||