diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-08 21:08:48 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-08 21:08:48 +0200 |
| commit | 3a6c7e009aed0fa24ae5d124115ba86d125d6ed6 (patch) | |
| tree | 1e358f0a3c5ee90852a71083e603fca867353f99 | |
| parent | 8062b73074b8e3c94fd97b77b05e7dbb61205d41 (diff) | |
| parent | 81fa7c3c3aeae80230253052015d8e5c34ba4201 (diff) | |
| download | MultiMC-3a6c7e009aed0fa24ae5d124115ba86d125d6ed6.tar MultiMC-3a6c7e009aed0fa24ae5d124115ba86d125d6ed6.tar.gz MultiMC-3a6c7e009aed0fa24ae5d124115ba86d125d6ed6.tar.lz MultiMC-3a6c7e009aed0fa24ae5d124115ba86d125d6ed6.tar.xz MultiMC-3a6c7e009aed0fa24ae5d124115ba86d125d6ed6.zip | |
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into test
| -rw-r--r-- | depends/quazip/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/depends/quazip/CMakeLists.txt b/depends/quazip/CMakeLists.txt index a9adcefe..6211fd28 100644 --- a/depends/quazip/CMakeLists.txt +++ b/depends/quazip/CMakeLists.txt @@ -1,11 +1,16 @@ 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 "${QT_ROOT}/src/3rdparty/zlib" CACHE PATH "Path to ZLIB headers of Qt") + SET(ZLIB_INCLUDE_DIRS "${Qt5_DIR}/include/QtZlib" 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") |