diff options
| author | hyunho <hhstark.kang@samsung.com> | 2018-02-09 13:18:28 +0900 |
|---|---|---|
| committer | Hyunho Kang <hhstark.kang@samsung.com> | 2018-03-08 01:02:58 +0000 |
| commit | 0be613fe5081799ac25acfc7e2e726abf3695ba8 (patch) | |
| tree | 66eedea6632ad7d271c26c6f45069218ac80f63f | |
| parent | 522cf9594ffc44e9da88510a11631ff2deb09757 (diff) | |
| download | screen-connector-sandbox/upgrade/efl120.tar.gz screen-connector-sandbox/upgrade/efl120.tar.bz2 screen-connector-sandbox/upgrade/efl120.zip | |
Fix screen watcher dependencysandbox/upgrade/efl120
Change-Id: Ia5918c628b39824dd4a076e14d073a8755f3b43c
Signed-off-by: hyunho <hhstark.kang@samsung.com>
(cherry picked from commit 69c94620936b6c84e29c5ef9d4bf7c84d138e31a)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | screen_connector_watcher/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | screen_connector_watcher/screen_connector_watcher.pc.in | 3 | ||||
| -rw-r--r-- | unittest/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd6837e..9afb333 100644 --- 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 8b172c1..3d9a027 100644 --- 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 fdc9a3d..5f77393 100644 --- 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 78a6b42..3af7e51 100644 --- 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/) |