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 changes Icccc1ca3,Ia32ce8ab 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
index
e7dc7cb
..
c3b14ab
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@
-8,6
+8,8
@@
SET(CAPI_LIB "dali-toolkit-internal")
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
utc-Dali-PushButton.cpp
# 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-Segmentation.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)
@@
-48,9
+50,9
@@
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(
+ ../../../
${${CAPI_LIB}_INCLUDE_DIRS}
../dali-toolkit/dali-toolkit-test-utils
${${CAPI_LIB}_INCLUDE_DIRS}
../dali-toolkit/dali-toolkit-test-utils
- ../../../
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})