mirror of https://github.com/libAthena/athena.git
Update zlib CMakeLists
This commit is contained in:
parent
2aa5b76732
commit
daf8bf0595
|
@ -1,15 +1,14 @@
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
# use toolchain zlib
|
# always use toolchain zlib
|
||||||
find_package(ZLIB REQUIRED)
|
set(ZLIB_REQUIRED REQUIRED)
|
||||||
add_library(z ALIAS ZLIB::ZLIB) # alias hack to allow use from global context
|
endif ()
|
||||||
set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE)
|
find_package(ZLIB ${ZLIB_REQUIRED})
|
||||||
else()
|
if (ZLIB_FOUND)
|
||||||
if(NOT WIN32 AND NOT NX) # remove WIN32 when specter/freetype is gone
|
add_library(z ALIAS ZLIB::ZLIB) # alias hack to allow use from global context
|
||||||
find_library(ZLIB_LIB NAMES zlib z)
|
set(ZLIB_LIBRARIES z CACHE STRING "zlib libraries" FORCE)
|
||||||
endif()
|
else ()
|
||||||
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
|
||||||
compress.c
|
compress.c
|
||||||
crc32.c
|
crc32.c
|
||||||
|
@ -32,17 +31,12 @@ add_library(z
|
||||||
zconf.h
|
zconf.h
|
||||||
zlib.h
|
zlib.h
|
||||||
zutil.h)
|
zutil.h)
|
||||||
if(WIN32 AND NOT UNIX)
|
if (WIN32 AND NOT UNIX)
|
||||||
install(FILES zconf.h zlib.h DESTINATION include COMPONENT zlib)
|
install(FILES zconf.h zlib.h DESTINATION include COMPONENT zlib)
|
||||||
install(TARGETS z DESTINATION lib COMPONENT zlib)
|
install(TARGETS z DESTINATION lib COMPONENT zlib)
|
||||||
else()
|
else ()
|
||||||
target_compile_options(z PRIVATE -Wno-implicit-fallthrough)
|
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()
|
endif ()
|
||||||
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()
|
|
||||||
|
|
Loading…
Reference in New Issue