X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=698cc492e116c32d5460e35ed7ac7558c9ca933f;hp=0f8a87ae862d8a4dd3c42193cf29fd411f230511;hb=bb94bb24a70ee1b0784afe6a7b2b875ec68053d1;hpb=f8dcbdf74b286506cc19b6efcad8c7d128f8fc80 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f8a87ae..698cc492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,7 +191,7 @@ if(WITH_WEBKIT) if(QT_QTWEBKIT_FOUND) message(STATUS "Found QtWebKit, enabling WebKit support") add_definitions(-DHAVE_WEBKIT) - set(LINK_WEBKIT WEBKIT) + set(LINK_WEBKIT WEBKIT XMLPATTERNS) set(HAVE_WEBKIT true) else(QT_QTWEBKIT_FOUND) message(STATUS "QtWebKit not found, disabling WebKit support") @@ -218,6 +218,14 @@ else(WITH_KDE) message(STATUS "Not enabling KDE4 integration") endif(WITH_KDE) +# needed to compile with mingw without kde +if(MINGW AND NOT HAVE_KDE) + add_definitions(-D_WIN32_WINNT=0x0500) + message(STATUS "Added _WIN32_WINNT=0x0500 definition for MinGW") +# workaround for bug in mingw gcc 4.0 + add_definitions(-U__STRICT_ANSI__) +endif(MINGW AND NOT HAVE_KDE) + # Setup Phonon support - we only need this if we don't have or want KDE4 if(NOT HAVE_KDE) if(WITH_PHONON) @@ -289,10 +297,12 @@ endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX) if(WIN32) link_libraries(imm32 winmm dbghelp Secur32) # missing by default :/ - + if(MSVC) + link_libraries(Version dwmapi shlwapi) + endif(MSVC) if(HAVE_SSL AND STATIC) find_package(OpenSSL REQUIRED) - link_libraries(${OPENSSL_LIBRARIES} libeay32MD) + link_libraries(${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES}) endif(HAVE_SSL AND STATIC) endif(WIN32)