diff options
| author | Sky <git@bunnies.cc> | 2013-09-08 19:51:40 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-09-08 19:51:40 +0100 |
| commit | 81fa7c3c3aeae80230253052015d8e5c34ba4201 (patch) | |
| tree | c630ff2678d794fdfef6c6ebf724b834096524dd /depends/quazip | |
| parent | b090070634ccdbad8f09203fbc9e65e0e14c3e51 (diff) | |
| download | MultiMC-81fa7c3c3aeae80230253052015d8e5c34ba4201.tar MultiMC-81fa7c3c3aeae80230253052015d8e5c34ba4201.tar.gz MultiMC-81fa7c3c3aeae80230253052015d8e5c34ba4201.tar.lz MultiMC-81fa7c3c3aeae80230253052015d8e5c34ba4201.tar.xz MultiMC-81fa7c3c3aeae80230253052015d8e5c34ba4201.zip | |
Attempt to fix quazip build error on Windows
Diffstat (limited to 'depends/quazip')
| -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") |