Tuned the settings dialog a bit, mostly fixing the layout problems we had and adding

[quassel.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d84f7df..7e0244f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,13 +20,13 @@ IF(BUILD MATCHES "mono" OR BUILD MATCHES "all")
   SET(BUILD_MONO true)
   MESSAGE("Building monolithic Quassel.")
 ENDIF(BUILD MATCHES "mono" OR BUILD MATCHES "all")
-IF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_GUI)
+IF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_QTGUI)
   MESSAGE(FATAL_ERROR "\nYou have not selected which parts of Quassel I should build. Aborting.\nRun 'cmake <path> -DBUILD=<part>', where <part> contains one or more of 'core', 'gui' or 'monolithic', or 'all' to build everything.\n")
-ENDIF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_GUI)
+ENDIF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_QTGUI)
 
-IF(BUILD_CORE OR BUILD_QTGUI)
-  MESSAGE(FATAL_ERROR "\nBuilding of standalone core or GUI not supported at this time. Please check back later.\n")
-ENDIF(BUILD_CORE OR BUILD_QTGUI)
+#IF(BUILD_CORE OR BUILD_QTGUI)
+#  MESSAGE(FATAL_ERROR "\nBuilding of standalone core or GUI not supported at this time. Please check back later.\n")
+#ENDIF(BUILD_CORE OR BUILD_QTGUI)
 
 SET(CMAKE_BUILD_TYPE Debug)
 
@@ -53,6 +53,7 @@ FIND_PACKAGE(Qt4 REQUIRED)
 SET(QT_USE_QTXML true)
 SET(QT_USE_QTSQL true)
 SET(QT_USE_QTNETWORK true)
+SET(QT_USE_QTUITOOLS true)
 SET(QT_DONT_USE_QTGUI true)   # This is added later if GUI is requested
 INCLUDE(${QT_USE_FILE})
 
@@ -69,6 +70,8 @@ ENDIF(BUILD_MONO AND NOT BUILD_CORE)
 
 QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS})
 
+ADD_DEFINITIONS(-Wall -Wextra -ansi)  # may not be portable!
+
 SET(TARGET_LIST )
 
 IF(BUILD_CORE)
@@ -93,7 +96,7 @@ IF(BUILD_QTGUI OR BUILD_MONO)  # OK, now we need QtGui!
   ENDIF(BUILD_MONO)
 
   IF(BUILD_QTGUI)
-    ADD_EXECUTABLE(quasselclient ${quassel_gui_SRCS} ${_RCCS})
+    ADD_EXECUTABLE(quasselclient ${quassel_qtgui_SRCS} ${_RCCS})
     TARGET_LINK_LIBRARIES(quasselclient common client qtgui ${QT_LIBRARIES})
     SET(TARGET_LIST ${TARGET_LIST} quasselclient)
   ENDIF(BUILD_QTGUI)