X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=d165e6268e795f19f3f2a5afbb3476cea7f0a32b;hb=168309311415f27f1c7015805637b50a01b43c1e;hp=eb95a21439c0a5dc9e000522a9b86379dc5c9d5f;hpb=b8519fa2d3e762435765afe92004b1bdcd7c6574;p=quassel.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb95a214..d165e626 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,23 @@
 # Builds the three main targets
 
+# Define resources for icons and pics, if needed
+# 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)
+  add_definitions(-DQUASSEL_ICONS_BUILTIN)
+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)
+  add_definitions(-DOXYGEN_ICONS_BUILTIN)
+endif(OXYGEN_ICONS MATCHES "Builtin")
+
+# Now it's time to build the modules...
+
 add_subdirectory(common)
 include_directories(common)
 if(WANT_CORE OR WANT_MONO)
@@ -15,18 +33,7 @@ if(WANT_QTCLIENT OR WANT_MONO)
   include_directories(qtui)
 endif(WANT_QTCLIENT OR WANT_MONO)
 
-# 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")
+# ... and finally the executables
 
 if(WANT_CORE)
   setup_qt4_variables(NETWORK SCRIPT SQL)
@@ -67,14 +74,14 @@ endif(WANT_MONO)
 if(APPLE)
   add_custom_command(TARGET quasselclient POST_BUILD
                      COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
-                             ${CMAKE_SOURCE_DIR} "Quassel Client" quasselclient)
+                             ${CMAKE_SOURCE_DIR} "Quassel Client" ../quasselclient)
   add_custom_command(TARGET quassel POST_BUILD
                      COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
-                             ${CMAKE_SOURCE_DIR} "Quassel" quassel)
+                             ${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
   if(DEPLOY)
     add_custom_command(TARGET quasselclient POST_BUILD
-                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client)
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..)
     add_custom_command(TARGET quasselcore POST_BUILD
-                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core)
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
   endif(DEPLOY)
 endif(APPLE)