From ae60afe3464478e7f1404984159fca37be37dd63 Mon Sep 17 00:00:00 2001 From: tmp64 Date: Sat, 2 Dec 2023 18:29:20 +0700 Subject: [PATCH] Fix zlib on Linux --- CMakeLists.txt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cf680b..52525ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -424,16 +424,9 @@ if( USE_UPDATER ) endif() # Find libraries - if( PLATFORM_WINDOWS ) - set( ZLIB_ROOT "${PLAT_EXTERNAL_PATH}/zlib" ) - set( ZLIB_USE_STATIC_LIBS ON ) - find_package( ZLIB REQUIRED ) - elseif ( PLATFORM_LINUX ) - # FIXME 2023-11-26: CMake completely ignores PLAT_EXTERNAL_PATH on Linux. - # FIXME 2023-11-26: But the system library works just fine - set( ZLIB_USE_STATIC_LIBS ON ) - find_package( ZLIB REQUIRED ) - endif() + set( ZLIB_ROOT "${PLAT_EXTERNAL_PATH}/zlib" ) + set( ZLIB_USE_STATIC_LIBS ON ) + find_package( ZLIB REQUIRED ) set( libzip_DIR "${PLAT_EXTERNAL_PATH}/libzip/lib/cmake/libzip" ) find_package( libzip REQUIRED NO_DEFAULT_PATH )