From 4738ba0f1a21448c6d410a9e046a41ee531f2bdb Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Tue, 14 May 2013 17:13:59 +0200 Subject: [PATCH] qt5: Fix use of zlib using config.h --- CMakeLists.txt | 3 +++ development/cmake/config.h.cmake | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0670356f4c..8706e154c2 100644 --- 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 a579dedc17..43618ac6f1 100644 --- 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