diff options
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index a313d2c1..232b6159 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -192,10 +192,11 @@ set(QT_MIN_VERSION "4.2.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) -if (NOT QT_DBUSXML2CPP_EXECUTABLE) - message(FATAL_ERROR "Qt4 qdbusxml2cpp was not found. Make sure it has been built and installed by Qt") -endif (NOT QT_DBUSXML2CPP_EXECUTABLE) - +if (NOT WIN32) + if (NOT QT_DBUSXML2CPP_EXECUTABLE) + message(FATAL_ERROR "Qt4 qdbusxml2cpp was not found. Make sure it has been built and installed by Qt") + endif (NOT QT_DBUSXML2CPP_EXECUTABLE) +endif (NOT WIN32) # Perl is required for building KDE software, find_package(Perl REQUIRED) @@ -508,6 +509,13 @@ if (WIN32) set( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES} ${GNUWIN32_INCLUDE_DIR}) + # for the zlib-library. we define it direct rather then using FindZLIB.cmake + # here cause currently we are using the kdewin32-directory as location where + # they should be stored. without those additional definitions cmake with + # mingw breaks compiling. + set(ZLIB_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + set(ZLIB_LIBRARY "${KDEWIN32_LIBRARIES}/zlib.lib") + # if we are compiling kdelibs, add KDEWIN32_LIBRARIES explicitely, # otherwise they come from KDELibsDependencies.cmake, Alex if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) |