X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=a45928a91547eb07fe9f5415265c078a00498dbc;hp=00b4e6612450b568888063fa6747266c9c134aa8;hb=d7e94af265bd78598bf52ce5fde6c7a1eba9e149;hpb=736012bf4a8b834d1adb2f4a3b0156380ecb5dcc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00b4e661..a45928a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,15 @@ if(WIN32)
   set(EMBED_DATA ON)
 endif(WIN32)
 
+# For static builds, arbitrary extra libs might need to be linked
+# Define a comma-separated list here
+# e.g. for pgsql, we need -DLINK_EXTRA=pq;crypt
+set(LINK_EXTRA "" CACHE STRING "Semicolon-separated list of libraries to be linked")
+if(LINK_EXTRA)
+  string(REPLACE "," ";" LINK_EXTRA ${LINK_EXTRA})
+  link_libraries(${LINK_EXTRA})
+endif(LINK_EXTRA)
+
 # Build Type
 # We need to make sure it's not empty
 # Supported: Release, RelWithDebugInfo, Debug, Debugfull
@@ -100,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")
@@ -253,15 +266,8 @@ if(WIN32)
   if(HAVE_SSL)
      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
   endif(HAVE_SSL)
-
-  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)