X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=00b4e6612450b568888063fa6747266c9c134aa8;hp=71b5518d793d450e71822205569db8efce7a188c;hb=030ea8e92fc051c20ab323f364072509b2eb1efb;hpb=dbf2519bd6f250b03a5311fea58a608a15192e82

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71b5518d..00b4e661 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)
 
@@ -77,9 +78,17 @@ endif(WIN32)
 # Build Type
 # We need to make sure it's not empty
 # Supported: Release, RelWithDebugInfo, Debug, Debugfull
-set(CMAKE_BUILD_TYPE "RelWithDebugInfo" CACHE STRING "CMake Build Type")
+
+# On WIN32, only Release seems to work correctly (?)
+if(WIN32)
+  set(DEFAULT_BUILD_TYPE "Release")
+else(WIN32)
+  set(DEFAULT_BUILD_TYPE "RelWithDebugInfo")
+endif(WIN32)
+
+set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING "CMake Build Type")
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "RelWithDebugInfo" CACHE STRING "CMake Build Type" FORCE)
+  set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING "CMake Build Type" FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 # Enable various flags on gcc
@@ -239,18 +248,20 @@ 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)
 
+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)