Fix 64 bit gtest cannot find .so bug

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33d392a..bae12f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,3 +18,7 @@ ADD_DEPENDENCIES(screen_connector_remote_surface_evas screen_connector_remote_su
 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)
+
+SET(SCREEN_CONNECTOR_UNIT_TESTS gtest-screen-connector)
+ADD_TEST(NAME ${SCREEN_CONNECTOR_UNIT_TESTS} COMMAND ${SCREEN_CONNECTOR_UNIT_TESTS}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest)

diff --git a/packaging/libscreen_connector.spec b/packaging/libscreen_connector.spec
index c09fd73..aa82cb4 100644 (file)
--- a/packaging/libscreen_connector.spec
+++ b/packaging/libscreen_connector.spec
@@ -91,7 +91,7 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %endif
 
 %check
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}/usr/lib/
+export LD_LIBRARY_PATH=../screen_connector_remote_surface
 ctest -V
 
 %if 0%{?gcov:1}

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index bc7fbca..2ce5c6f 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -25,11 +25,6 @@ ADD_EXECUTABLE(${PROJECT_NAME}
        ${SOURCES}
 )
 
-ADD_TEST(
-  NAME gtest-screen-connector
-  COMMAND gtest-screen-connector
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-screen-connector_LDFLAGS} screen_connector_watcher)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-screen-connector_LDFLAGS} screen_connector_remote_surface)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)