X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=a85c6053004e7753137cecb3f18c65a926877612;hb=4210e2e53b76c0c5dd2d271b753ec0bd73aee139;hp=c9cc4805c6f370172033327083e1b8af9fef1d86;hpb=5ede6af7a00aff73493e36ecb81ef6ecb115cc0e;p=platform%2Fcore%2Fappfw%2Fapp-core.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9cc480..a85c605 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,20 @@ SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 # Build appcore-common Library
 # ------------------------------
 SET(APPCORE_COMMON "appcore-common")
-SET(SRCS_common src/legacy/appcore.c src/legacy/appcore-measure.c src/legacy/appcore-rotation.c src/legacy/appcore-i18n.c src/base/appcore_base.c)
-
-SET(HEADERS_common appcore-common.h appcore_base.h)
+SET(SRCS_common
+	src/legacy/appcore.c
+	src/legacy/appcore-measure.c
+	src/legacy/appcore-rotation.c
+	src/legacy/appcore-i18n.c
+	src/base/appcore_base.c
+	src/base/appcore_base_control.c
+	src/watchdog/appcore_watchdog.c)
+
+SET(HEADERS_common
+	appcore-common.h
+	appcore_base.h
+	appcore_watchdog.h
+	appcore_base_control.h)
 
 INCLUDE(FindPkgConfig)
 SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog capi-system-info")
@@ -58,7 +69,7 @@ SET(SRCS_ui src/ui_base/appcore_ui_base.c src/ui_base/appcore_ui_plugin.c)
 SET(HEADERS_ui appcore_ui_base.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_UI_PKG_CHECK_MODULES "dlog ecore gobject-2.0 glib-2.0 aul bundle pkgmgr-info ttrace ecore-wayland tizen-extension-client wayland-client")
+SET(APPCORE_UI_PKG_CHECK_MODULES "dlog ecore gobject-2.0 glib-2.0 aul bundle pkgmgr-info ttrace ecore-wl2 tizen-extension-client wayland-client")
 
 pkg_check_modules(pkg_ui REQUIRED ${APPCORE_UI_PKG_CHECK_MODULES})
 
@@ -70,7 +81,7 @@ ADD_LIBRARY(${APPCORE_UI} SHARED ${SRCS_ui})
 SET_TARGET_PROPERTIES(${APPCORE_UI} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${APPCORE_UI} PROPERTIES VERSION ${FULLVER})
 SET_TARGET_PROPERTIES(${APPCORE_UI} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_ui})
-TARGET_LINK_LIBRARIES(${APPCORE_UI} ${pkg_efl_LDFLAGS} ${APPCORE_COMMON})
+TARGET_LINK_LIBRARIES(${APPCORE_UI} ${pkg_ui_LDFLAGS} ${APPCORE_COMMON})
 
 CONFIGURE_FILE(${APPCORE_UI}.pc.in ${APPCORE_UI}.pc @ONLY)
 
@@ -88,7 +99,7 @@ SET(SRCS_efl src/legacy/appcore-efl.c src/efl_base/appcore_efl_base.c)
 SET(HEADERS_efl appcore-efl.h appcore_efl_base.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog aul bundle voice-control-elm")
+SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog aul bundle")
 
 pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2})
 
@@ -122,7 +133,7 @@ SET(SRCS_mw src/multiwindow_base/appcore_multiwindow_base.c
 SET(HEADERS_mw appcore_multiwindow_base.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_MULTIWINDOW_PKG_CHECK_MODULES "dlog ecore gobject-2.0 glib-2.0 aul ecore-wayland")
+SET(APPCORE_MULTIWINDOW_PKG_CHECK_MODULES "dlog ecore gobject-2.0 glib-2.0 aul ecore-wl2")
 
 pkg_check_modules(pkg_mw REQUIRED ${APPCORE_MULTIWINDOW_PKG_CHECK_MODULES})