From 05de1e75e9316ce7e8e5ca3ac21c7405e170fd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 8 Sep 2013 22:31:49 +0200 Subject: Fix up QuaZip zlib header lookup on Windows. --- depends/quazip/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'depends') diff --git a/depends/quazip/CMakeLists.txt b/depends/quazip/CMakeLists.txt index 6211fd28..48fdb6be 100644 --- a/depends/quazip/CMakeLists.txt +++ b/depends/quazip/CMakeLists.txt @@ -1,16 +1,12 @@ project(quazip) -# use QtCreator's QTDIR var -IF(DEFINED ENV{QTDIR}) - SET(Qt5_DIR $ENV{QTDIR}) -ENDIF() - # Find ZLIB for quazip # Use system zlib on unix and Qt ZLIB on Windows IF(UNIX) find_package(ZLIB REQUIRED) ELSE(UNIX) - SET(ZLIB_INCLUDE_DIRS "${Qt5_DIR}/include/QtZlib" CACHE PATH "Path to ZLIB headers of Qt") + get_filename_component (ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE) + SET(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt") SET(ZLIB_LIBRARIES "") IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") MESSAGE("Please specify a valid zlib include dir") -- cgit v1.2.3