X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=07d2f2ff0dee4c98ca5ace530280f51592b6ecee;hp=d84f7dfed0daa57fa1e949a04243b63a68a65ed0;hb=38db2f48a30f697ef8c0b61dfa6345e8a53336fd;hpb=15d0a434fa4f2255593d6cc62fa2223fd0247b86

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d84f7dfe..07d2f2ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,15 +20,16 @@ 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)
+SET(GCC_WARN "-Wall -Wextra -ansi -Wno-unused-parameter")  # may not be portable!
 
 # Define files
 SET(quassel_mono_SRCS common/build_mono.cpp)
@@ -53,9 +54,12 @@ 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})
 
+ADD_DEFINITIONS(${GCC_WARN})
+
 # Define subdirs. CMake complains if a directory is added twice, so make sure this
 # does not happen in any combination of the requested targets.
 
@@ -93,7 +97,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)