Build the monolithic client (-DWANT_MONO=ON) by default again, as it's usable now

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60da133..36922f8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@
 #                     : select binaries to build
 # -DWITH_OPENSSL=OFF  : Disable OpenSSL support
 # -DWITH_DBUS=OFF     : Disable D-Bus support
+# -DWITH_WEBKIT=OFF   : Disable WebKit support
 # -DOXYGEN_ICONS=(Builtin|External)  : If "Builtin" (the default), compile our Oxygen Icon Theme subset into the binary
 #                                    : If "External", we assume Oxygen is already installed on the system
 # -DQUASSEL_ICONS=(Builtin|External) : If "Builtin" (the default), put our own icons into the binary
@@ -29,7 +30,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 # Various options and variables that can be set on the command line
 option(WANT_CORE     "Build the core (server) binary"           ON)
 option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
-option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
+option(WANT_MONO     "Build the monolithic (all-in-one) binary" ON)
 
 option(WITH_OPENSSL  "Enable OpenSSL support if present on the system" ON)
 option(WITH_DBUS     "Enable D-Bus support if present on the system"   ON)
@@ -161,12 +162,14 @@ if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
   endif(HAVE_SSL)
 endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 
-if(STATIC AND WIN32)
-  link_libraries(imm32 winmm)  # missing by default :/
-   if(HAVE_SSL)
+if(WIN32)
+  #if(STATIC)
+  link_libraries(imm32 winmm dbghelp)  # missing by default :/
+  #endif(STATIC)
+  if(HAVE_SSL)
      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
-   endif(HAVE_SSL)
-endif(STATIC AND WIN32)
+  endif(HAVE_SSL)
+endif(WIN32)
 
 if(WIN32)
   set(RC_WIN32 ../pics/win32.rc)  # for app icons on windows
@@ -184,7 +187,7 @@ target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES})
 
 get_target_property(GENVERSION_EXECUTABLE genversion LOCATION)
 add_custom_target(genversion_run ALL ${GENVERSION_EXECUTABLE}
-                  ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen)
+                  ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/version.gen)
 add_dependencies(genversion_run genversion)
 
 # Decide what to do with icons
@@ -217,7 +220,3 @@ add_subdirectory(icons)
 #add_subdirectory(pics)
 add_subdirectory(i18n)
 add_subdirectory(src)
-
-# Make sure version.gen exists before building mod_common
-# TODO: make only main.cpp depend on that! Recompiles suck...
-add_dependencies(mod_common genversion_run)