Skip to content

Commit

Permalink
Fix zlib on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
tmp64 committed Dec 2, 2023
1 parent ca33b0d commit ae60afe
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down

0 comments on commit ae60afe

Please sign in to comment.