summaryrefslogtreecommitdiffstats
path: root/depends/quazip
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-08 22:31:49 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-08 22:31:49 +0200
commit05de1e75e9316ce7e8e5ca3ac21c7405e170fd68 (patch)
tree1abc7878f389940d0eef6ab3a21cf639a444436e /depends/quazip
parent3a6c7e009aed0fa24ae5d124115ba86d125d6ed6 (diff)
downloadMultiMC-05de1e75e9316ce7e8e5ca3ac21c7405e170fd68.tar
MultiMC-05de1e75e9316ce7e8e5ca3ac21c7405e170fd68.tar.gz
MultiMC-05de1e75e9316ce7e8e5ca3ac21c7405e170fd68.tar.lz
MultiMC-05de1e75e9316ce7e8e5ca3ac21c7405e170fd68.tar.xz
MultiMC-05de1e75e9316ce7e8e5ca3ac21c7405e170fd68.zip
Fix up QuaZip zlib header lookup on Windows.
Diffstat (limited to 'depends/quazip')
-rw-r--r--depends/quazip/CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
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")