X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=251869eeedaf28e9f123af9f30de3572b8a5e873;hp=00b4e6612450b568888063fa6747266c9c134aa8;hb=18c308a2857b86e882e2865c4a35319bdeb9d7eb;hpb=94c044f0b66f18df2f84e84fc6b2c183db39152f diff --git a/CMakeLists.txt b/CMakeLists.txt index 00b4e661..251869ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,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") @@ -257,11 +261,6 @@ if(WIN32) set(RC_WIN32 ../pics/win32.rc) # for app icons on windows 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)