libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update zlib CMakeLists

This commit is contained in:
Luke Street 2021-06-14 17:18:15 -04:00
parent 2aa5b76732
commit daf8bf0595
1 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extern/zlib/CMakeLists.txt vendored
View File

@ -1,13 +1,12 @@
if (APPLE) if (APPLE)
# use toolchain zlib # always use toolchain zlib
find_package(ZLIB REQUIRED) set(ZLIB_REQUIRED REQUIRED)
endif ()
find_package(ZLIB ${ZLIB_REQUIRED})
if (ZLIB_FOUND)
add_library(z ALIAS ZLIB::ZLIB) # alias hack to allow use from global context add_library(z ALIAS ZLIB::ZLIB) # alias hack to allow use from global context
set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE) set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE)
else () else ()
if(NOT WIN32 AND NOT NX) # remove WIN32 when specter/freetype is gone
find_library(ZLIB_LIB NAMES zlib z)
endif()
if(NOT ZLIB_LIB)
message(STATUS "Using Athena's built-in zlib") message(STATUS "Using Athena's built-in zlib")
add_library(z add_library(z
adler32.c adler32.c
@ -40,9 +39,4 @@ target_compile_options(z PRIVATE -Wno-implicit-fallthrough)
endif () endif ()
set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE) set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE)
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "zlib include directory" FORCE) set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "zlib include directory" FORCE)
else()
set(ZLIB_LIBRARIES ${ZLIB_LIB} CACHE PATH "zlib libraries" FORCE)
find_path(ZLIB_INCLUDE_DIR zlib.h PATHS "${PNG_LIB}/../../include")
message(STATUS "Using zlib at ${ZLIB_LIB}, include: ${ZLIB_INCLUDE_DIR}")
endif()
endif () endif ()