qt5: Fix use of zlib using config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0670356f4c7c7077a561e8e406b8ab5c2be406b3..8706e154c26269df53063b52c9c5db16b9ceb1a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -716,6 +716,9 @@ if (CMAKE_GENERATOR MATCHES Xcode)
     MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
 ENDIF(CMAKE_GENERATOR MATCHES Xcode)
 
+if (WIN32 AND Qt5Core_FOUND)
+       set(Z_PREFIX 1)
+endif()
 
 # compiler tests, config.h generation
 if(MSVC AND NOT LYX_CONFIGURE_CHECKS)

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index a579dedc17397bf22580a93bda78073a68bb9164..43618ac6f10e7384033d55d7ffae9f3e6eab5401 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -57,6 +57,8 @@
 #cmakedefine LYX_USE_TR1 1
 #cmakedefine LYX_USE_TR1_REGEX 1
 
+#cmakedefine Z_PREFIX 1
+
 #cmakedefine ASPELL_FOUND 1
 #ifdef ASPELL_FOUND
 #define USE_ASPELL 1