Merge "Merge branch 'devel/new_mesh' into devel/master" 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 4eb0052..17a9b50 100644 (file)
--- a/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@ -6,16 +6,14 @@ SET(RPM_NAME "core-${PKG_NAME}-tests")
 SET(CAPI_LIB "dali-internal")
 
 SET(TC_SOURCES
-        utc-Dali-Internal-Character.cpp
-        utc-Dali-Internal-Font.cpp
         utc-Dali-Internal-Handles.cpp
         utc-Dali-Internal-ImageFactory.cpp
-        utc-Dali-Internal-Mesh.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
+        utc-Dali-Internal-RelayoutController.cpp
+        utc-Dali-Internal-FrustumCulling.cpp
 )
 
 LIST(APPEND TC_SOURCES
@@ -37,16 +35,18 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
      dali-core
 )
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror=return-type")
 
 FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
 ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
 INCLUDE_DIRECTORIES(
+    ../../..
+    .
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali/dali-test-suite-utils
-    ../../..
+    ../dali-devel
 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})