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
Merge "Libraries & RPM renamed to provide DALi 2" into devel/master
[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
17a9b50
..
f39572a
100644
(file)
--- a/
automated-tests/src/dali-internal/CMakeLists.txt
+++ b/
automated-tests/src/dali-internal/CMakeLists.txt
@@
-6,23
+6,21
@@
SET(RPM_NAME "core-${PKG_NAME}-tests")
SET(CAPI_LIB "dali-internal")
SET(TC_SOURCES
SET(CAPI_LIB "dali-internal")
SET(TC_SOURCES
- utc-Dali-Internal-Handles.cpp
- utc-Dali-Internal-ImageFactory.cpp
- utc-Dali-Internal-ResourceClient.cpp
- utc-Dali-Internal-Image-Culling.cpp
+ utc-Dali-Internal-ActorObserver.cpp
+ utc-Dali-Internal-Core.cpp
utc-Dali-Internal-FixedSizeMemoryPool.cpp
utc-Dali-Internal-FixedSizeMemoryPool.cpp
- utc-Dali-Internal-MemoryPoolObjectAllocator.cpp
- utc-Dali-Internal-RelayoutController.cpp
utc-Dali-Internal-FrustumCulling.cpp
utc-Dali-Internal-FrustumCulling.cpp
+ utc-Dali-Internal-Handles.cpp
+ utc-Dali-Internal-MemoryPoolObjectAllocator.cpp
+ utc-Dali-Internal-OwnerPointer.cpp
)
LIST(APPEND TC_SOURCES
../dali/dali-test-suite-utils/mesh-builder.cpp
../dali/dali-test-suite-utils/test-harness.cpp
)
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/test-actor-utils.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-native-image.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-native-image.cpp
@@
-32,10
+30,11
@@
LIST(APPEND TC_SOURCES
)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
- dali-core
+ dali
2
-core
)
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror=return-type")
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
@@
-52,6
+51,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}
+ --coverage
)
INSTALL(PROGRAMS ${EXEC_NAME}
)
INSTALL(PROGRAMS ${EXEC_NAME}