[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdeplasma-addons/4=2E6=5D_runners/=3A_add_dependenc?=
From:       Pino Toscano <pino () kde ! org>
Date:       2011-02-05 1:06:02
Message-ID: 20110205010602.582F1A609B () git ! kde ! org
[Download RAW message or body]

Git commit 7432377f018c8a86faf5645c53dbd68f120cc73c by Pino Toscano.
Committed on 05/02/11 at 02:00.
Pushed by pino into branch '4.6'.

add dependencies to avoid parallel build issues

in the runners targets, a couple of sources include headers which include \
.ui-generated headers, which are not available when the kcm of that runner is not \
built yet

as easy solution to solve the issues, make the runner plugin targets depend on the \
targets of their kcm

M  +1    -0    runners/characters/CMakeLists.txt     
M  +1    -0    runners/events/CMakeLists.txt     

http://commits.kde.org/kdeplasma-addons/7432377f018c8a86faf5645c53dbd68f120cc73c

diff --git a/runners/characters/CMakeLists.txt b/runners/characters/CMakeLists.txt
index ef4d957..15ebba9 100644
--- a/runners/characters/CMakeLists.txt
+++ b/runners/characters/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(kcm_krunner_charrunner
 # Now make sure all files get to the right place
 kde4_add_plugin(krunner_charrunner ${krunner_charrunner_SRCS})
 target_link_libraries(krunner_charrunner ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+add_dependencies(krunner_charrunner kcm_krunner_charrunner)
 
 # Install the library and .desktop file
 install(TARGETS krunner_charrunner kcm_krunner_charrunner DESTINATION \
                ${PLUGIN_INSTALL_DIR})
diff --git a/runners/events/CMakeLists.txt b/runners/events/CMakeLists.txt
index c8be4ac..a8042c4 100644
--- a/runners/events/CMakeLists.txt
+++ b/runners/events/CMakeLists.txt
@@ -11,6 +11,7 @@ set(events_SRCS events.cpp datetime_parser.cpp datetime_range.cpp \
collection_sel  
 kde4_add_plugin(plasma_runner_events ${events_SRCS})
 target_link_libraries(plasma_runner_events ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} \
${KDE4_AKONADI_LIBS} ${KDEPIMLIBS_KCAL_LIBS}) +add_dependencies(plasma_runner_events \
kcm_plasma_runner_events)  
 # Config module
 set(kcm_events_SRCS events_config.cpp collection_selector.cpp)


[prev in list] [next in list] [prev in thread] [next in thread]