From eb8cd1a5b44ecc2d00a46fb5bbc6b50352cc010c Mon Sep 17 00:00:00 2001 From: Uleat Date: Sat, 13 Jul 2019 00:43:56 -0400 Subject: [PATCH] Fix for build zlib option when not using vcpkg --- CMakeLists.txt | 2 +- libs/zlibng/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c1538b03..2b0b36639 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,7 +313,7 @@ IF(ZLIB_FOUND) OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF) IF(EQEMU_BUILD_ZLIB) - INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng") + INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng") SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic") ELSE() INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}") diff --git a/libs/zlibng/CMakeLists.txt b/libs/zlibng/CMakeLists.txt index b1845522b..9767a00c8 100644 --- a/libs/zlibng/CMakeLists.txt +++ b/libs/zlibng/CMakeLists.txt @@ -861,5 +861,5 @@ if (ZLIB_ENABLE_TESTS) endif() endif() -FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES) +# FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)