X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=05c0c2a439c5246858bbd5d58273aff38ae7316e;hp=67f0d5f9253e8b596b71b63d62e8eea203898815;hb=16c9fb5606113ddbcbe4be61f8ed2b775f31055e;hpb=60021fef0c9644e022095043a9072d5ad99c89e4

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67f0d5f9..05c0c2a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,18 +1,18 @@
 # Builds the three main targets
 
 add_subdirectory(common)
-include_directories(common)
+include_directories(BEFORE common)
 if(WANT_CORE OR WANT_MONO)
   add_subdirectory(core)
-  include_directories(core)
+  include_directories(BEFORE core)
 endif(WANT_CORE OR WANT_MONO)
 if(WANT_QTCLIENT OR WANT_MONO)
   add_subdirectory(client)
   add_subdirectory(uisupport)
   add_subdirectory(qtui)
-  include_directories(client)
-  include_directories(uisupport)
-  include_directories(qtui)
+  include_directories(BEFORE client)
+  include_directories(BEFORE uisupport)
+  include_directories(BEFORE qtui)
 #  if(HAVE_KDE)
 #    add_subdirectory(kdeui)
 #    include_directories(kdeui)
@@ -20,37 +20,30 @@ if(WANT_QTCLIENT OR WANT_MONO)
 #  endif(HAVE_KDE)
 endif(WANT_QTCLIENT OR WANT_MONO)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
 
-# We always add stuff in :/pics
-qt4_add_resources(CLIENT_DEPS ../pics/pics.qrc)
-
-if(QUASSEL_ICONS MATCHES "Builtin")
-  set(CLIENT_DEPS ${CLIENT_DEPS} ../icons/qrc_hicolor.cxx)
-  set_source_files_properties(../icons/qrc_hicolor.cxx PROPERTIES GENERATED true)
-endif(QUASSEL_ICONS MATCHES "Builtin")
-
-if(OXYGEN_ICONS MATCHES "Builtin")
-  set(CLIENT_DEPS ${CLIENT_DEPS} ../icons/qrc_oxygen.cxx)
-  set_source_files_properties(../icons/qrc_oxygen.cxx PROPERTIES GENERATED true)
-endif(OXYGEN_ICONS MATCHES "Builtin")
+# Add resources. Can't be done in other subdirs apparently.
+# Note that these variables need to contain paths relative to src/ (this dir)
+qt4_add_resources(CLIENT_DEPS ${CLIENT_RCS})
+qt4_add_resources(CORE_DEPS ${CORE_RCS})
+qt4_add_resources(COMMON_DEPS ${COMMON_RCS})
 
 if(WANT_CORE)
   setup_qt4_variables(NETWORK SCRIPT SQL)
   add_executable(quasselcore common/main.cpp ${COMMON_DEPS} ${CORE_DEPS})
-  add_dependencies(quasselcore genversion_run)
+  add_dependencies(quasselcore i18n genversion_run)
   set_target_properties(quasselcore PROPERTIES
                                     COMPILE_FLAGS "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE"
                                     OUTPUT_NAME ../quasselcore)
   target_link_libraries(quasselcore mod_core mod_common
-                                    ${QUASSEL_QT_LIBRARIES} ${QUASSEL_KDE_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
+                                    ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
   install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 endif(WANT_CORE)
 
 if(WANT_QTCLIENT)
   setup_qt4_variables(${LINK_DBUS} GUI NETWORK ${LINK_WEBKIT})
   add_executable(quasselclient WIN32 common/main.cpp ${COMMON_DEPS} ${CLIENT_DEPS})
-  add_dependencies(quasselclient icons genversion_run)
+  add_dependencies(quasselclient i18n genversion_run)
   set_target_properties(quasselclient PROPERTIES
                                       COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI"
                                       OUTPUT_NAME ../quasselclient)
@@ -63,7 +56,7 @@ if(WANT_MONO)
   setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL ${LINK_WEBKIT})
   qt4_wrap_cpp(MOC qtui/monoapplication.h)
   add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${MOC} ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
-  add_dependencies(quassel icons genversion_run)
+  add_dependencies(quassel i18n genversion_run)
   set_target_properties(quassel PROPERTIES
                                 COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_MONO"
                                 OUTPUT_NAME ../quassel)