X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-third-party%2FCMakeLists.txt;h=9633069948415a8dad868c32b7c99fcb54ce9b9e;hb=HEAD;hp=e8fa65233fcb6e833191abefe316972ff0d92174;hpb=f1150c8895518f78f8c2b9c4cb1464ffaffdf16e;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 e8fa652..9633069 100644 --- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt @@ -13,8 +13,8 @@ SET(TC_SOURCES # List of test harness files (Won't get parsed for test cases) SET(TEST_HARNESS_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.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 @@ -31,13 +31,17 @@ SET(TEST_HARNESS_SOURCES ../dali-toolkit/dali-toolkit-test-utils/test-button.cpp ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp ../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp - ../dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-object.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-graphics-framebuffer.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-sampler.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-pipeline.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-graphics-shader.cpp ../dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp ../dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp ../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp @@ -53,7 +57,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 ) @@ -69,6 +73,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 @@ -86,6 +92,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}