From 16749747cc5827b346b818a947b360c060d7667f Mon Sep 17 00:00:00 2001 From: Le-Tin Date: Wed, 1 Sep 2021 10:54:43 +0000 Subject: gtest_dlt_daemon_gateway: fix gtest build failed Add gtest and gtest_main libraries if we don't install gtest package in system Create a new message fillter config file when running gtest gateway shell script set type of control message is CONTROL_MESSAGE_ON_DEMAND when testing dlt_gateway_send_control_message function Signed-off-by: Le-Tin --- tests/CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tests/CMakeLists.txt') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ccf6e03..a461891 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,8 +8,12 @@ configure_file(${PROJECT_SOURCE_DIR}/tests/testfile.dlt ${PROJECT_BINARY_DIR}/te configure_file(${PROJECT_SOURCE_DIR}/tests/testfilter.txt ${PROJECT_BINARY_DIR}/tests COPYONLY) configure_file(${PROJECT_SOURCE_DIR}/tests/testfile_filetransfer.txt ${PROJECT_BINARY_DIR}/tests COPYONLY) -set(GTEST_LIBS gtest gtest_main) -set(GTEST_LIBS ${GTEST_LIBS} CACHE STRING "Gtest libraries") +if("${GTEST_BOTH_LIBRARIES}" STREQUAL "") + set(GTEST_LIBS gtest gtest_main) + set(GTEST_LIBS ${GTEST_LIBS} CACHE STRING "Gtest libraries") +else() + set(GTEST_LIBS ${GTEST_BOTH_LIBRARIES}) +endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(LIBRARIES "") @@ -17,9 +21,9 @@ else() set(LIBRARIES socket) endif() -set(DLT_LIBRARIES dlt ${GTEST_BOTH_LIBRARIES} ${LIBRARIES}) -set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_BOTH_LIBRARIES} ${LIBRARIES}) -set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_BOTH_LIBRARIES}) +set(DLT_LIBRARIES dlt ${GTEST_LIBS} ${LIBRARIES}) +set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES}) +set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_LIBS}) #Receiver used for QTs. add_test() is not required add_executable(dlt_test_receiver dlt_test_receiver.c) -- cgit v1.2.1