From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Wed, 18 Jun 2008 17:01:15 +0000 (+0200)
Subject: Merge branch 'master' of git@git.quassel-irc.org:quassel
X-Git-Tag: 0.3.0~363
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0f206dd896485276cf25025e562c812b8c7fc5da;hp=08c505bd5ee36baca9ca33ee7d1adfcb01b7ab59

Merge branch 'master' of git@git.quassel-irc.org:quassel
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64951676..e5ffc94f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,29 +30,26 @@ set(STATIC 0 CACHE BOOL "Enable static building (might not be portable)")
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
 set(SPUTDEV CACHE STRING "Do not use!")
 
-# Temporary
-if(STATICWIN)
-  set(STATIC 1)
-endif(STATICWIN)
-
 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)
 
 # Enable various flags on gcc
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-Wall Wall)
-if(Wall)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif(Wall)
-check_cxx_compiler_flag(-Wextra Wextra)
-if(Wextra)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-endif(Wextra)
-check_cxx_compiler_flag(-ansi ansi)
-if(ansi)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
-endif(ansi)
+if(CMAKE_COMPILER_IS_GNUCXX)
+  include(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag(-Wall HAVE_WALL)
+  if(HAVE_WALL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+  endif(HAVE_WALL)
+  check_cxx_compiler_flag(-Wextra HAVE_WEXTRA)
+  if(HAVE_WEXTRA)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+  endif(HAVE_WEXTRA)
+  check_cxx_compiler_flag(-ansi HAVE_ANSI)
+  if(HAVE_ANSI)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
+  endif(HAVE_ANSI)
+endif(CMAKE_COMPILER_IS_GNUCXX)
 
 set(QT_MIN_VERSION "4.3.0")
 
@@ -80,7 +77,7 @@ include_directories(${QT_INCLUDES})
 # 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)
-target_link_libraries(genversion ${QT_LIBRARIES})
+target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES})
 
 add_custom_target(genversion_run ALL ${CMAKE_BINARY_DIR}/genversion
                   ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen)
diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
index f67395b6..d778da6f 100644
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
@@ -287,9 +287,9 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
 SET( QT_DEFINITIONS "")
 
-IF (WIN32)
+IF (WIN32 AND NOT STATIC)
   SET(QT_DEFINITIONS -DQT_DLL)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT STATIC)
 
 SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)