projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Moved font client plugin to new folder" into devel/master
[platform/core/uifw/dali-adaptor.git]
/
automated-tests
/
src
/
dali-platform-abstraction
/
CMakeLists.txt
diff --git
a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
index
531ce4c
..
22f69f3
100644
(file)
--- a/
automated-tests/src/dali-platform-abstraction/CMakeLists.txt
+++ b/
automated-tests/src/dali-platform-abstraction/CMakeLists.txt
@@
-16,10
+16,12
@@
LIST(APPEND TC_SOURCES
../dali-adaptor/dali-test-suite-utils/test-harness.cpp
../dali-adaptor/dali-test-suite-utils/test-application.cpp
../dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp
../dali-adaptor/dali-test-suite-utils/test-harness.cpp
../dali-adaptor/dali-test-suite-utils/test-application.cpp
../dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp
- ../dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.cpp
+ ../dali-adaptor/dali-test-suite-utils/test-graphics-sync-impl.cpp
+ ../dali-adaptor/dali-test-suite-utils/test-graphics-sync-object.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-buffer.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-command-buffer.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-controller.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-buffer.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-command-buffer.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-controller.cpp
+ ../dali-adaptor/dali-test-suite-utils/test-graphics-framebuffer.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-texture.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-sampler.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-pipeline.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-texture.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-sampler.cpp
../dali-adaptor/dali-test-suite-utils/test-graphics-pipeline.cpp
@@
-43,10
+45,7
@@
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
ADD_COMPILE_OPTIONS(-O0 -ggdb --coverage -Wall -Werror)
ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
ADD_COMPILE_OPTIONS(-O0 -ggdb --coverage -Wall -Werror)
ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
-# Shouldn't have to do this!
-# But CMake's new auto-escape quote policy doesn't work right.
-CMAKE_POLICY(SET CMP0005 OLD)
-ADD_DEFINITIONS(-DTEST_IMAGE_DIR=\"\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../images\\\"\" )
+ADD_DEFINITIONS(-DTEST_IMAGE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../images\" )
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}")