projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ImageVisual to store TextureSet when LoadPolicy::IMMEDIATE" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
CMakeLists.txt
diff --git
a/automated-tests/src/dali-toolkit/CMakeLists.txt
b/automated-tests/src/dali-toolkit/CMakeLists.txt
index
19f812e
..
4def66d
100755
(executable)
--- a/
automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/
automated-tests/src/dali-toolkit/CMakeLists.txt
@@
-8,6
+8,7
@@
SET(CAPI_LIB "dali-toolkit")
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
utc-Dali-Alignment.cpp
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
utc-Dali-Alignment.cpp
+ utc-Dali-AnimatedImageVisual.cpp
utc-Dali-BloomView.cpp
utc-Dali-BubbleEmitter.cpp
utc-Dali-Builder.cpp
utc-Dali-BloomView.cpp
utc-Dali-BubbleEmitter.cpp
utc-Dali-Builder.cpp
@@
-35,6
+36,7
@@
SET(TC_SOURCES
utc-Dali-TextSelectionPopup.cpp
utc-Dali-TextSelectionPopupMirroringLTR.cpp
utc-Dali-TextSelectionPopupMirroringRTL.cpp
utc-Dali-TextSelectionPopup.cpp
utc-Dali-TextSelectionPopupMirroringLTR.cpp
utc-Dali-TextSelectionPopupMirroringRTL.cpp
+ utc-Dali-TextureManager.cpp
utc-Dali-ToolBar.cpp
utc-Dali-Tooltip.cpp
utc-Dali-TransitionData.cpp
utc-Dali-ToolBar.cpp
utc-Dali-Tooltip.cpp
utc-Dali-TransitionData.cpp
@@
-108,7
+110,8
@@
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali-toolkit
)
dali-toolkit
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror")
+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\" )
ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
@@
-125,7
+128,7
@@
INCLUDE_DIRECTORIES(
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
TARGET_LINK_LIBRARIES(${EXEC_NAME}
${${CAPI_LIB}_LIBRARIES}
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
TARGET_LINK_LIBRARIES(${EXEC_NAME}
${${CAPI_LIB}_LIBRARIES}
- -lpthread
+ -lpthread
--coverage
)
INSTALL(PROGRAMS ${EXEC_NAME}
)
INSTALL(PROGRAMS ${EXEC_NAME}