(no commit message)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 255d5fd..0e66327 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 PROJECT(Quassel)
 
 PROJECT(Quassel)
 

+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.2)
+

 # Select if Quassel should be built in client, server or monolithic mode
 SET(BUILD "mono" CACHE STRING "Defines which Quassel parts are to be built. Can contain 'server', 'client' and/or 'monolithic' (which is the default).")
 SET(BUILD_SERVER )
 # Select if Quassel should be built in client, server or monolithic mode
 SET(BUILD "mono" CACHE STRING "Defines which Quassel parts are to be built. Can contain 'server', 'client' and/or 'monolithic' (which is the default).")
 SET(BUILD_SERVER )

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 1177e96..f45bf33 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -5,5 +5,7 @@ SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditd
 
 QT4_WRAP_UI(_UIC ${gui_UICS})
 QT4_WRAP_CPP(_MOC ${gui_MOCS})
 
 QT4_WRAP_UI(_UIC ${gui_UICS})
 QT4_WRAP_CPP(_MOC ${gui_MOCS})

+MESSAGE("uic: ${_UIC}")
+MESSAGE("moc: ${_MOC}")

 
 

-ADD_LIBRARY(gui ${_UIC} ${_MOC} ${gui_HDRS} ${gui_SRCS})
+ADD_LIBRARY(gui ${gui_HDRS} ${gui_SRCS} ${_MOC} ${_UIC})