From: TimePath Date: Sat, 29 Jul 2017 13:45:26 +0000 (+1000) Subject: CMake: switch minizip casing X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=b5391544e08298842dc61947979da08a89e0a26e CMake: switch minizip casing --- diff --git a/cmake/FindMinizip.cmake b/cmake/FindMinizip.cmake index b874c391..10a5fc6f 100644 --- a/cmake/FindMinizip.cmake +++ b/cmake/FindMinizip.cmake @@ -5,5 +5,5 @@ if (PKG_CONFIG_FOUND) else () set(_PACKAGE_ARGS "") endif () - pkg_check_modules(MINIZIP minizip ${_PACKAGE_ARGS}) + pkg_check_modules(Minizip minizip ${_PACKAGE_ARGS}) endif () diff --git a/tools/quake3/CMakeLists.txt b/tools/quake3/CMakeLists.txt index 511162a3..1a852983 100644 --- a/tools/quake3/CMakeLists.txt +++ b/tools/quake3/CMakeLists.txt @@ -29,7 +29,7 @@ find_package(ZLIB REQUIRED) include_directories(${ZLIB_INCLUDE_DIRS}) find_package(Minizip REQUIRED) -include_directories(${MINIZIP_INCLUDE_DIRS}) +include_directories(${Minizip_INCLUDE_DIRS}) set(q3map2_games q3map2/game_darkplaces.h @@ -124,7 +124,7 @@ target_link_libraries(q3map2 ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${LIBXML2_LIBRARIES} - ${MINIZIP_LIBRARIES} + ${Minizip_LIBRARIES} ${ZLIB_LIBRARIES} ddslib etclib @@ -160,7 +160,7 @@ radiant_tool(q3data target_link_libraries(q3data ${GLIB_LIBRARIES} ${LIBXML2_LIBRARIES} - ${MINIZIP_LIBRARIES} + ${Minizip_LIBRARIES} ${ZLIB_LIBRARIES} filematch etclib