X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-third-party%2FCMakeLists.txt;h=994ec67d9239cf744a8709126fa66a9b742de879;hb=f9649c1d7583b0e1af1c91f1f1518323921e6a47;hp=e30acba56c27cf8b57821c85b0ba184a196aabdd;hpb=d65dc625c30e54d41e071d45f36e06cd0ba88079;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt index e30acba..994ec67 100644 --- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt @@ -14,7 +14,6 @@ SET(TC_SOURCES SET(TEST_HARNESS_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp @@ -57,7 +56,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED ) # Locate GTest -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2) FIND_PACKAGE(GTest REQUIRED) #ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror ) @@ -73,6 +72,8 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS}) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}") ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS}) +STRING(STRIP ${CMAKE_CXX_LINK_FLAGS} CMAKE_CXX_LINK_FLAGS) + INCLUDE_DIRECTORIES( ../../../ ../../../dali-toolkit/third-party @@ -90,6 +91,7 @@ ADD_CUSTOM_COMMAND( ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES}) TARGET_LINK_LIBRARIES(${EXEC_NAME} + ${CMAKE_CXX_LINK_FLAGS} ${${CAPI_LIB}_LIBRARIES} -lpthread --coverage ${GTEST_LIBRARIES}