From 0115a3a87437d4da33b8162776e6149cbe5de236 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sat, 5 Nov 2016 12:11:04 +0100 Subject: [PATCH] Revert "Link OpenMW with libz on macOS" This reverts commit 0c4dd05118527bbc51e690edf8497c8690e6e86d. --- CI/before_script.osx.sh | 1 + apps/openmw/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 00a948c65..32bdd41ae 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -10,6 +10,7 @@ mkdir build cd build cmake \ +-D CMAKE_EXE_LINKER_FLAGS="-lz" \ -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \ -D CMAKE_OSX_DEPLOYMENT_TARGET="10.8" \ -D CMAKE_OSX_SYSROOT="macosx10.11" \ diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index c349e3fef..58dc2e8e5 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -181,7 +181,7 @@ endif() if(APPLE) find_library(COCOA_FRAMEWORK Cocoa) find_library(IOKIT_FRAMEWORK IOKit) - target_link_libraries(openmw z ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) + target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) if (FFmpeg_FOUND) find_library(COREVIDEO_FRAMEWORK CoreVideo)