diff --git a/CMakeLists.txt b/CMakeLists.txt index 04c672730..124d0c47c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -351,10 +351,9 @@ if(NOT GEKKO AND NOT NX) endif () endif() -if (APPLE) - # use toolchain zlib +if (NOT WIN32) find_package(ZLIB REQUIRED) - set(ZLIB_LIBRARIES ZLIB::ZLIB) + set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE STRING "zlib libraries" FORCE) endif() if (NOT BUILD_ATDNA) diff --git a/extern/athena b/extern/athena index 8558ca1b5..991ffede7 160000 --- a/extern/athena +++ b/extern/athena @@ -1 +1 @@ -Subproject commit 8558ca1b5111ebe83ee44b1200b0b0d1d94f2fa2 +Subproject commit 991ffede795a60b3bf8765601afda1ef02424ee8