From b955e3f9fe45d910e1e502fbf8020b03478db3c5 Mon Sep 17 00:00:00 2001 From: John Brooks Date: Mon, 12 Nov 2012 14:25:45 -0700 Subject: [PATCH] Use launcherlib from qdeclarativebooster --- src/launcherlib/CMakeLists.txt | 2 -- src/qdeclarativebooster/CMakeLists.txt | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/launcherlib/CMakeLists.txt b/src/launcherlib/CMakeLists.txt index b97c8dc..93e060a 100644 --- a/src/launcherlib/CMakeLists.txt +++ b/src/launcherlib/CMakeLists.txt @@ -14,8 +14,6 @@ set(SRC appdata.cpp booster.cpp boosterfactory.cpp boosterpluginregistry.cpp set(HEADERS appdata.h booster.h boosterfactory.h boosterpluginregistry.h connection.h daemon.h logger.h launcherlib.h singleinstance.h socketmanager.h) -qt4_wrap_cpp(MOC_SRC ${MOC_HDRS}) - # Set libraries to be linked. Shared libraries to be preloaded are not linked in anymore, # but dlopen():ed and listed in src/launcher/preload.h instead. link_libraries(${LIBDL} ${X11_LIBRARIES}) diff --git a/src/qdeclarativebooster/CMakeLists.txt b/src/qdeclarativebooster/CMakeLists.txt index 497b0ea..15c1a52 100644 --- a/src/qdeclarativebooster/CMakeLists.txt +++ b/src/qdeclarativebooster/CMakeLists.txt @@ -9,9 +9,7 @@ set(COMMON "${CMAKE_HOME_DIRECTORY}/src/common") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${COMMON} ${LAUNCHER}) # Set sources -set(PLUGINSRC qdeclarativebooster.cpp pluginfactory.cpp ${LAUNCHER}/appdata.cpp ${LAUNCHER}/booster.cpp -${LAUNCHER}/connection.cpp ${LAUNCHER}/logger.cpp -${LAUNCHER}/singleinstance.cpp ${LAUNCHER}/socketmanager.cpp ${COMMON}/eventhandler.cpp) +set(PLUGINSRC qdeclarativebooster.cpp pluginfactory.cpp ${COMMON}/eventhandler.cpp) set(MOC_HDRS ${COMMON}/eventhandler.h) qt4_wrap_cpp(MOC_SRC ${MOC_HDRS}) @@ -29,7 +27,7 @@ target_link_libraries(mdeclarativecache ${LIBDL} ${QT_QTCORE_LIBRARY} ${QT_QTDEC add_library(qdeclarativebooster MODULE ${PLUGINSRC} ${MOC_SRC}) set_target_properties(qdeclarativebooster PROPERTIES COMPILE_FLAGS -fvisibility=hidden) -target_link_libraries(qdeclarativebooster ${LIBDL} "-L. -lmdeclarativecache") +target_link_libraries(qdeclarativebooster ${LIBDL} "-L. -lmdeclarativecache -L../launcherlib -lapplauncherd") add_dependencies(qdeclarativebooster mdeclarativecache) # Add install rule