Bugfix tests: rpath added to make universal-switch a shared library

Change-Id: Ibe93abe150dbeaa87a4e8c0273653b17b160a9a3

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5dc470b..278c018 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,15 +6,18 @@ INCLUDE_DIRECTORIES(googletest/googlemock/include/)
 INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS})
 
 
-SET(TESTS_INSTALL_DIR tests/)
+SET(TESTS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/tests/)
 
-ADD_LIBRARY(universal-switch-test STATIC $<TARGET_OBJECTS:universal-switch-obj>)
+# universal-switch-test library has to be SHARED otherwise ActivityFactory.instance().createActivity() will not work
+ADD_LIBRARY(universal-switch-test SHARED $<TARGET_OBJECTS:universal-switch-obj>)
 TARGET_LINK_LIBRARIES(universal-switch-test ${pkgs_LDFLAGS})
+INSTALL(TARGETS universal-switch-test DESTINATION ${TESTS_INSTALL_DIR})
 
 FUNCTION(CREATE_TEST TEST_SRC_FILE)
     GET_FILENAME_COMPONENT(TESTNAME ${TEST_SRC_FILE} NAME_WE)
 
     ADD_EXECUTABLE(test_${TESTNAME} ${TEST_SRC_FILE})
+    SET_TARGET_PROPERTIES(test_${TESTNAME} PROPERTIES INSTALL_RPATH "${TESTS_INSTALL_DIR}")
     TARGET_LINK_LIBRARIES(test_${TESTNAME} gtest_main universal-switch-test)
     INSTALL(TARGETS test_${TESTNAME} DESTINATION ${TESTS_INSTALL_DIR})
 ENDFUNCTION()