From 40a6e33e021a61d850876f5f02327e62713fbe3f Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Mon, 19 Dec 2022 00:22:16 +0900 Subject: [PATCH] Fix utc compile error for gcc-11 Change-Id: I260ae8f9202a5f7cdb7e146291897e81fdbf7a69 Signed-off-by: Eunki Hong --- automated-tests/src/dali-toolkit-third-party/CMakeLists.txt | 5 ++++- .../dali-toolkit-test-utils/toolkit-environment-variable.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt index e30acba..aa881bc 100644 --- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt @@ -57,7 +57,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED ) # Locate GTest -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2) FIND_PACKAGE(GTest REQUIRED) #ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror ) @@ -73,6 +73,8 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS}) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}") ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS}) +STRING(STRIP ${CMAKE_CXX_LINK_FLAGS} CMAKE_CXX_LINK_FLAGS) + INCLUDE_DIRECTORIES( ../../../ ../../../dali-toolkit/third-party @@ -90,6 +92,7 @@ ADD_CUSTOM_COMMAND( ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES}) TARGET_LINK_LIBRARIES(${EXEC_NAME} + ${CMAKE_CXX_LINK_FLAGS} ${${CAPI_LIB}_LIBRARIES} -lpthread --coverage ${GTEST_LIBRARIES} diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp index 4fc6cf2..3bd51bc 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp @@ -19,6 +19,7 @@ // EXTERNAL INCLUDE #include +#include namespace Dali { -- 2.7.4