projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.0.33] Merge branch 'tizen'
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali-internal
/
CMakeLists.txt
diff --git
a/automated-tests/src/dali-internal/CMakeLists.txt
b/automated-tests/src/dali-internal/CMakeLists.txt
index
9728100
..
26b6e8f
100644
(file)
--- a/
automated-tests/src/dali-internal/CMakeLists.txt
+++ b/
automated-tests/src/dali-internal/CMakeLists.txt
@@
-10,15
+10,22
@@
SET(TC_SOURCES
utc-Dali-Internal-Font.cpp
utc-Dali-Internal-Handles.cpp
utc-Dali-Internal-ImageFactory.cpp
utc-Dali-Internal-Font.cpp
utc-Dali-Internal-Handles.cpp
utc-Dali-Internal-ImageFactory.cpp
- utc-Dali-Internal-M
aterial
.cpp
+ utc-Dali-Internal-M
esh
.cpp
utc-Dali-Internal-Text.cpp
utc-Dali-Internal-ResourceClient.cpp
utc-Dali-Internal-Image-Culling.cpp
utc-Dali-Internal-Text.cpp
utc-Dali-Internal-ResourceClient.cpp
utc-Dali-Internal-Image-Culling.cpp
+ utc-Dali-Internal-Text-Culling.cpp
+ utc-Dali-Internal-Constraint.cpp
+ utc-Dali-Internal-FixedSizeMemoryPool.cpp
+ utc-Dali-Internal-MemoryPoolObjectAllocator.cpp
)
LIST(APPEND TC_SOURCES
)
LIST(APPEND TC_SOURCES
+ ../dali/dali-test-suite-utils/mesh-builder.cpp
+ ../dali/dali-test-suite-utils/test-harness.cpp
../dali/dali-test-suite-utils/dali-test-suite-utils.cpp
../dali/dali-test-suite-utils/test-application.cpp
../dali/dali-test-suite-utils/dali-test-suite-utils.cpp
../dali/dali-test-suite-utils/test-application.cpp
+ ../dali/dali-test-suite-utils/test-dynamics.cpp
../dali/dali-test-suite-utils/test-gesture-manager.cpp
../dali/dali-test-suite-utils/test-gl-abstraction.cpp
../dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp
../dali/dali-test-suite-utils/test-gesture-manager.cpp
../dali/dali-test-suite-utils/test-gl-abstraction.cpp
../dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp
@@
-26,7
+33,6
@@
LIST(APPEND TC_SOURCES
../dali/dali-test-suite-utils/test-platform-abstraction.cpp
../dali/dali-test-suite-utils/test-render-controller.cpp
../dali/dali-test-suite-utils/test-trace-call-stack.cpp
../dali/dali-test-suite-utils/test-platform-abstraction.cpp
../dali/dali-test-suite-utils/test-render-controller.cpp
../dali/dali-test-suite-utils/test-trace-call-stack.cpp
- ../dali-unmanaged/dali-test-suite-utils/mesh-builder.cpp
)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
@@
-42,7
+48,6
@@
ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(
${${CAPI_LIB}_INCLUDE_DIRS}
../dali/dali-test-suite-utils
INCLUDE_DIRECTORIES(
${${CAPI_LIB}_INCLUDE_DIRS}
../dali/dali-test-suite-utils
- ../dali-unmanaged/dali-test-suite-utils
../../..
)
../../..
)