diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-09-19 21:09:24 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-09-20 07:21:00 +0000 |
| commit | 27928c63ae4ba1a904c67851e5e93fc4f748a55e (patch) | |
| tree | a0551ba1b0eb8d5bfa8b531a6cab36275fe2515e | |
| parent | db2ecc45564609f940ff564e777f76a1a4b734d4 (diff) | |
Fix build with Qt 5.10 with moved zlib
See qtbase commit 5169d588a599036aa1962f518a7c321f5e3e7296.
Change-Id: Idc491c3ccb94a309aa683b956cc3eeb0826ad041
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index fcab90880..b15bd9266 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -51,9 +51,11 @@ build_pass|!debug_and_release { } !qtConfig(system-zlib):exists($$QTBASE_DIR) { - CMAKE_CONFIG += \ - QT_BUNDLED_ZLIB=1 \ - ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib + CMAKE_CONFIG += QT_BUNDLED_ZLIB=1 + + exists($$QTBASE_DIR/src/3rdparty/zlib/src/zlib.h): \ + CMAKE_CONFIG += ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib/src + else: CMAKE_CONFIG += ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib } qtConfig(opengles2):!qtConfig(dynamicgl) { |