X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=251869eeedaf28e9f123af9f30de3572b8a5e873;hp=26a3e9a4c447b31ab9e723ef3a15923d2022b81d;hb=18c308a2857b86e882e2865c4a35319bdeb9d7eb;hpb=ad4415fe8e9d021d17442da1081f426718638c41 diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a3e9a4..251869ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ set(LINGUAS "" CACHE STRING "Comma-separated list of locales specifying language # Some settings imply others if(STATIC) + add_definitions(-DSTATIC) set(WITH_KDE OFF CACHE BOOL "Static building with KDE is not supported") endif(STATIC) @@ -99,7 +100,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3") endif(CMAKE_COMPILER_IS_GNUCXX) -set(QT_MIN_VERSION "4.4.0") +if(WANT_MONO OR WANT_QTCLIENT) + set(QT_MIN_VERSION "4.4.1") # Client crashes often with 4.4.0 +else(WANT_MONO OR WANT_QTCLIENT) + set(QT_MIN_VERSION "4.4.0") +endif(WANT_MONO OR WANT_QTCLIENT) if(APPLE AND DEPLOY) set(CMAKE_OSX_ARCHITECTURES "i386;ppc") @@ -247,15 +252,12 @@ if(STATIC AND CMAKE_COMPILER_IS_GNUCXX) endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX) if(WIN32) - #if(STATIC) - link_libraries(imm32 winmm dbghelp) # missing by default :/ - #endif(STATIC) + link_libraries(imm32 winmm dbghelp Secur32) # missing by default :/ + if(HAVE_SSL) link_libraries(${OPENSSL_LIBRARIES} libeay32MD) endif(HAVE_SSL) -endif(WIN32) -if(WIN32) set(RC_WIN32 ../pics/win32.rc) # for app icons on windows endif(WIN32)