Fix screen watcher dependency

Change-Id: Ia5918c628b39824dd4a076e14d073a8755f3b43c
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd6837e3166edc53b48997218cc5e42f9f7742ac..9afb3336b0e464515587bfb00da6afef8ae1ed37 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,5 +8,6 @@ ADD_SUBDIRECTORY(screen_connector_watcher_evas)
 ADD_SUBDIRECTORY(unittest)
 
 ADD_DEPENDENCIES(screen_connector_remote_surface_evas screen_connector_remote_surface)
+ADD_DEPENDENCIES(screen_connector_watcher screen_connector_remote_surface)
 ADD_DEPENDENCIES(screen_connector_watcher_evas screen_connector_watcher screen_connector_remote_surface_evas)
-ADD_DEPENDENCIES(gtest-screen-connector screen_connector_watcher_evas)
+ADD_DEPENDENCIES(gtest-screen-connector screen_connector_watcher)

diff --git a/screen_connector_watcher/CMakeLists.txt b/screen_connector_watcher/CMakeLists.txt
index 51310d48bb8e628822d61d970c09963087521ece..5a78fdd8fb57afc770e63e2bf79ed6ab04dc70b1 100644 (file)
--- a/screen_connector_watcher/CMakeLists.txt
+++ b/screen_connector_watcher/CMakeLists.txt
@@ -37,7 +37,7 @@ ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${screen_connector_watcher_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${screen_connector_watcher_LDFLAGS} screen_connector_remote_surface)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")

diff --git a/screen_connector_watcher/screen_connector_watcher.pc.in b/screen_connector_watcher/screen_connector_watcher.pc.in
index fdc9a3d52ab8461d685c86781f3ddf1cae2f8a33..5f77393031d7e00514a2d5fdabf86a73edc30848 100644 (file)
--- a/screen_connector_watcher/screen_connector_watcher.pc.in
+++ b/screen_connector_watcher/screen_connector_watcher.pc.in
@@ -6,6 +6,7 @@ includedir=@INCLUDEDIR@
 Name: screen_connector_watcher
 Description: Support development of the Screen Connector Watcher library
 Version: @VERSION@
-Libs: -L${libdir} -lscreen_connector_watcher
+Requires: screen_connector_remote_surface
+Libs: -L${libdir} -lscreen_connector_remote_surface -lscreen_connector_watcher
 Cflags: -I${includedir}
 cppflags: -I${includedir}

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 78a6b42d50036f2e3a33b67d4ebb014fc9482efe..3af7e51efba8e3fb761a9ad07cdbbf4d3e1fe437 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -25,6 +25,6 @@ ADD_EXECUTABLE(${PROJECT_NAME}
        ${SOURCES}
 )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-screen-connector_LDFLAGS} screen_connector_watcher_evas screen_connector_remote_surface_evas screen_connector_remote_surface)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-screen-connector_LDFLAGS} screen_connector_watcher)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)