X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=9ac2d3085460a39bc04e71f2875f3ee64fe7389c;hp=dd3355b776b37c098afcc01b8aa46b25453df1e4;hb=1d145922198e7e5d727c9bca8a92f95cf40d02ef;hpb=e65e46d007d7f5f59274590dec3bc1d8e5f94e91

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd3355b7..9ac2d308 100644
--- 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
@@ -169,7 +170,7 @@ if(STATIC AND WIN32)
 endif(STATIC AND WIN32)
 
 if(WIN32)
-  set(RC_WIN32 pics/win32.rc)  # for app icons on windows
+  set(RC_WIN32 ../pics/win32.rc)  # for app icons on windows
 endif(WIN32)
 
 # This is dirty, but I haven't found a cleaner way to ensure that the generated .qrc files
@@ -184,7 +185,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 +218,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)