From 991ff0b90f8bfd2bdc1f78d4f5ec0b992b85ebea Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 6 Jul 2017 17:21:59 +0100 Subject: [PATCH] Updating test harness CMakeLists.txt to work with newer versions of CMAKE Change-Id: Iab5d9701f2c1ed8354a92e3855e4a3a9da522094 --- automated-tests/src/dali-internal/CMakeLists.txt | 4 +++- automated-tests/src/dali/CMakeLists.txt | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt index d4a459f..5fc4d99 100644 --- a/automated-tests/src/dali-internal/CMakeLists.txt +++ b/automated-tests/src/dali-internal/CMakeLists.txt @@ -32,7 +32,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror") +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}") @@ -49,6 +50,7 @@ INCLUDE_DIRECTORIES( ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES}) TARGET_LINK_LIBRARIES(${EXEC_NAME} ${${CAPI_LIB}_LIBRARIES} + --coverage ) INSTALL(PROGRAMS ${EXEC_NAME} diff --git a/automated-tests/src/dali/CMakeLists.txt b/automated-tests/src/dali/CMakeLists.txt index 33fee82..fb890b3 100644 --- a/automated-tests/src/dali/CMakeLists.txt +++ b/automated-tests/src/dali/CMakeLists.txt @@ -117,7 +117,8 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali-core ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${CAPI_LIB}_CFLAGS_OTHER} -O0 -ggdb --coverage -Wall -Werror") +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}") @@ -132,7 +133,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} -- 2.7.4