From 519330b404d388707625aefea84fd9365951fe79 Mon Sep 17 00:00:00 2001 From: John Brooks Date: Thu, 15 Nov 2012 11:09:26 -0700 Subject: [PATCH] Fix build dependency for mdeclarativecache --- src/qdeclarativebooster/CMakeLists.txt | 1 + tests/common/testapps/fala_qml_helloworld/CMakeLists.txt | 1 + tests/common/unittests/ut_dbooster/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/src/qdeclarativebooster/CMakeLists.txt b/src/qdeclarativebooster/CMakeLists.txt index 020ccad..bccf6e1 100644 --- a/src/qdeclarativebooster/CMakeLists.txt +++ b/src/qdeclarativebooster/CMakeLists.txt @@ -22,6 +22,7 @@ if ($ENV{HARMATTAN}) set_target_properties(mdeclarativecache PROPERTIES COMPILE_FLAGS -DHAVE_PATH_REINIT) endif ($ENV{HARMATTAN}) target_link_libraries(mdeclarativecache ${LIBDL} ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} "-L../launcherlib -lapplauncherd") +add_dependencies(mdeclarativecache applauncherd) add_library(qdeclarativebooster MODULE ${PLUGINSRC}) set_target_properties(qdeclarativebooster PROPERTIES diff --git a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt index 5fe3ecd..552902c 100644 --- a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt +++ b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt @@ -30,6 +30,7 @@ include(${QT_USE_FILE}) link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} "-L${CMAKE_SOURCE_DIR}/src/launcherlib -lapplauncherd -L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster ${booster_libs}") add_executable(fala_qml ${SRC} ${RESOURCE_SRC}) +add_dependencies(fala_qml applauncherd mdeclarativecache) # Install install(PROGRAMS fala_qml DESTINATION /usr/bin/ RENAME fala_qml_wol) diff --git a/tests/common/unittests/ut_dbooster/CMakeLists.txt b/tests/common/unittests/ut_dbooster/CMakeLists.txt index 4bbec88..ee84fce 100644 --- a/tests/common/unittests/ut_dbooster/CMakeLists.txt +++ b/tests/common/unittests/ut_dbooster/CMakeLists.txt @@ -24,6 +24,7 @@ link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} "-L include(${QT_USE_FILE}) add_executable(ut_dbooster ${SRC} ${MOC_SRC} ) +add_dependencies(ut_dbooster mdeclarativecache) # Install install(PROGRAMS ut_dbooster DESTINATION /usr/share/applauncherd-tests/)