projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated test case CmakeLists.txt to work with newer version of CMAKE
[platform/core/uifw/dali-adaptor.git]
/
automated-tests
/
src
/
dali-adaptor
/
CMakeLists.txt
diff --git
a/automated-tests/src/dali-adaptor/CMakeLists.txt
b/automated-tests/src/dali-adaptor/CMakeLists.txt
index
89be323
..
ee64cb2
100644
(file)
--- a/
automated-tests/src/dali-adaptor/CMakeLists.txt
+++ b/
automated-tests/src/dali-adaptor/CMakeLists.txt
@@
-5,15
+5,27
@@
SET(RPM_NAME "core-${PKG_NAME}-tests")
SET(CAPI_LIB "dali-adaptor")
SET(TC_SOURCES
SET(CAPI_LIB "dali-adaptor")
SET(TC_SOURCES
+ utc-Dali-Application.cpp
+ utc-Dali-FileLoader.cpp
+ utc-Dali-GifLoading.cpp
+ utc-Dali-ImageLoading.cpp
utc-Dali-Key.cpp
utc-Dali-Key.cpp
+ utc-Dali-NativeImageSource.cpp
+ utc-Dali-PixelBuffer.cpp
utc-Dali-SingletonService.cpp
utc-Dali-Timer.cpp
utc-Dali-SingletonService.cpp
utc-Dali-Timer.cpp
- utc-Dali-Application.cpp
+ utc-Dali-TtsPlayer.cpp
+ utc-Dali-Window.cpp
+ #utc-Dali-Watch.cpp
+ #utc-Dali-Watch-Time.cpp
+ #utc-Dali-KeyGrab.cpp
)
LIST(APPEND TC_SOURCES
)
LIST(APPEND TC_SOURCES
- dali-test-suite-utils/
test-harness
.cpp
+ dali-test-suite-utils/
mesh-builder
.cpp
dali-test-suite-utils/dali-test-suite-utils.cpp
dali-test-suite-utils/dali-test-suite-utils.cpp
+ dali-test-suite-utils/test-actor-utils.cpp
+ dali-test-suite-utils/test-harness.cpp
dali-test-suite-utils/test-application.cpp
dali-test-suite-utils/test-gesture-manager.cpp
dali-test-suite-utils/test-gl-abstraction.cpp
dali-test-suite-utils/test-application.cpp
dali-test-suite-utils/test-gesture-manager.cpp
dali-test-suite-utils/test-gl-abstraction.cpp
@@
-26,25
+38,30
@@
LIST(APPEND TC_SOURCES
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali-core
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali-core
- dali
+ dali
-adaptor
ecore
ecore
+ ecore-x
)
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER}")
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
+
+ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(
+ ../../../
${${CAPI_LIB}_INCLUDE_DIRS}
dali-test-suite-utils
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
TARGET_LINK_LIBRARIES(${EXEC_NAME}
${${CAPI_LIB}_INCLUDE_DIRS}
dali-test-suite-utils
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
TARGET_LINK_LIBRARIES(${EXEC_NAME}
- ${${CAPI_LIB}_LIBRARIES}
+ ${${CAPI_LIB}_LIBRARIES}
+ --coverage
)
INSTALL(PROGRAMS ${EXEC_NAME}
)
INSTALL(PROGRAMS ${EXEC_NAME}