anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qt5: Fix use of zlib using config.h

Browse Source
This commit is contained in:
Vincent van Ravesteijn 2013-05-14 17:13:59 +02:00
parent 0b9714f8df
commit 4738ba0f1a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -716,6 +716,9 @@ if (CMAKE_GENERATOR MATCHES Xcode)
MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}") MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
ENDIF(CMAKE_GENERATOR MATCHES Xcode) ENDIF(CMAKE_GENERATOR MATCHES Xcode)
if (WIN32 AND Qt5Core_FOUND)
set(Z_PREFIX 1)
endif()
# compiler tests, config.h generation # compiler tests, config.h generation
if(MSVC AND NOT LYX_CONFIGURE_CHECKS) if(MSVC AND NOT LYX_CONFIGURE_CHECKS)

2
development/cmake/config.h.cmake
View File

@ -57,6 +57,8 @@
#cmakedefine LYX_USE_TR1 1 #cmakedefine LYX_USE_TR1 1
#cmakedefine LYX_USE_TR1_REGEX 1 #cmakedefine LYX_USE_TR1_REGEX 1
#cmakedefine Z_PREFIX 1
#cmakedefine ASPELL_FOUND 1 #cmakedefine ASPELL_FOUND 1
#ifdef ASPELL_FOUND #ifdef ASPELL_FOUND
#define USE_ASPELL 1 #define USE_ASPELL 1