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 "Fixed issue of LOOPING, MUTED, and VOLUME properties" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
CMakeLists.txt
diff --git
a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
old mode 100644
(file)
new mode 100755
(executable)
index
4a9a003
..
6ec6207
--- a/
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@
-7,7
+7,6
@@
SET(CAPI_LIB "dali-toolkit-internal")
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
- utc-Dali-PushButton.cpp
utc-Dali-Text-CharacterSetConversion.cpp
utc-Dali-Text-Cursor.cpp
utc-Dali-Text-Segmentation.cpp
utc-Dali-Text-CharacterSetConversion.cpp
utc-Dali-Text-Cursor.cpp
utc-Dali-Text-Segmentation.cpp
@@
-18,9
+17,14
@@
SET(TC_SOURCES
utc-Dali-VisualModel.cpp
utc-Dali-Text-Layout.cpp
utc-Dali-Text-Controller.cpp
utc-Dali-VisualModel.cpp
utc-Dali-Text-Layout.cpp
utc-Dali-Text-Controller.cpp
- utc-Dali-VisualFactoryResolveUrl.cpp
- utc-Dali-Visuals.cpp
+ utc-Dali-VisualUrl.cpp
utc-Dali-Text-Markup.cpp
utc-Dali-Text-Markup.cpp
+ utc-Dali-Text-Typesetter.cpp
+ utc-Dali-Text-ViewModel.cpp
+ utc-Dali-DebugRendering.cpp
+ utc-Dali-ItemView-internal.cpp
+ utc-Dali-PropertyHelper.cpp
+ utc-Dali-ColorConversion.cpp
)
# Append list of test harness files (Won't get parsed for test cases)
)
# Append list of test harness files (Won't get parsed for test cases)
@@
-53,7
+57,7
@@
LIST(APPEND TC_SOURCES
../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
../dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp
../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
../dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp
- dali-toolkit-test-utils/toolkit-text-
model
.cpp
+ dali-toolkit-test-utils/toolkit-text-
utils
.cpp
)
)
@@
-65,6
+69,8
@@
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror")
+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})
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})