X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=a45928a91547eb07fe9f5415265c078a00498dbc;hp=6a2cf835bd2aaff58e860aba28e4211284fd0c4f;hb=e049ffc61b5e260a49d73102a74c3821af827e77;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2cf835..a45928a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,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") @@ -264,11 +268,6 @@ if(WIN32) endif(HAVE_SSL) endif(WIN32) -if(STATIC) - link_directories(${QT_PLUGINS_DIR}/imageformats) - link_libraries(qjpeg qgif) -endif(STATIC) - # We need to create a version.gen # For this, we create our genversion binary and make sure it is run every time. add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)