From 0bf48c83e071b953f783f28d28365b75dfaab7da Mon Sep 17 00:00:00 2001
From: David Steele <david.steele@samsung.com>
Date: Thu, 6 Jul 2017 16:56:01 +0100
Subject: [PATCH] Updated test case CmakeLists.txt to work with newer version
 of CMAKE

Change-Id: Iad48ae95621764d399ee6d1d5b727b9fbb15584c
---
 automated-tests/src/dali-adaptor-internal/CMakeLists.txt     | 5 +++--
 automated-tests/src/dali-adaptor/CMakeLists.txt              | 7 ++++---
 automated-tests/src/dali-platform-abstraction/CMakeLists.txt | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
index c41bc4d..ee37c4e 100644
--- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
@@ -38,7 +38,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     dali-adaptor
     ecore
 )
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror" )
+
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
 
 # Shouldn't have to do this!
 # But CMake's new auto-escape quote policy doesn't work right.
@@ -71,7 +72,7 @@ INCLUDE_DIRECTORIES(
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
-    -lpthread
+    -lpthread --coverage
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}
diff --git a/automated-tests/src/dali-adaptor/CMakeLists.txt b/automated-tests/src/dali-adaptor/CMakeLists.txt
index 4ae66c4..ee64cb2 100644
--- a/automated-tests/src/dali-adaptor/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor/CMakeLists.txt
@@ -43,8 +43,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     ecore-x
 )
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror")
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER}")
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
 
 ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
 
@@ -60,7 +60,8 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
-    ${${CAPI_LIB}_LIBRARIES}
+  ${${CAPI_LIB}_LIBRARIES}
+  --coverage
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}
diff --git a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
index 94b7bc3..5d04249 100644
--- a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
+++ b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     dali-adaptor
 )
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror" )
+ADD_COMPILE_OPTIONS(-O0 -ggdb --coverage -Wall -Werror)
+
 
 # Shouldn't have to do this!
 # But CMake's new auto-escape quote policy doesn't work right.
@@ -53,7 +54,8 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
-    ${${CAPI_LIB}_LIBRARIES}
+  ${${CAPI_LIB}_LIBRARIES}
+  --coverage
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}
-- 
2.7.4