diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-08 22:32:24 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-08 22:32:24 +0200 |
| commit | d6ba7d5494f14f67871366cf103452720a26fe88 (patch) | |
| tree | 1abc7878f389940d0eef6ab3a21cf639a444436e | |
| parent | 8062b73074b8e3c94fd97b77b05e7dbb61205d41 (diff) | |
| parent | 05de1e75e9316ce7e8e5ca3ac21c7405e170fd68 (diff) | |
| download | MultiMC-d6ba7d5494f14f67871366cf103452720a26fe88.tar MultiMC-d6ba7d5494f14f67871366cf103452720a26fe88.tar.gz MultiMC-d6ba7d5494f14f67871366cf103452720a26fe88.tar.lz MultiMC-d6ba7d5494f14f67871366cf103452720a26fe88.tar.xz MultiMC-d6ba7d5494f14f67871366cf103452720a26fe88.zip | |
Merge branch 'test' into develop
| -rw-r--r-- | depends/quazip/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/depends/quazip/CMakeLists.txt b/depends/quazip/CMakeLists.txt index a9adcefe..48fdb6be 100644 --- a/depends/quazip/CMakeLists.txt +++ b/depends/quazip/CMakeLists.txt @@ -5,7 +5,8 @@ project(quazip) 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") + 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") |