diff --git a/Makefile b/Makefile index de733e6..8cfe10f 100755 --- a/Makefile +++ b/Makefile @@ -29,5 +29,5 @@ clean: external/curl/curl-8.1.2 \ external/libconfig/libconfig-1.7.3 \ external/goahead-5.2.0/GoAhead \ - out \ + output_files \ cmake-shell \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4223a6b..0b12399 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,6 +2,12 @@ # cmake_minimum_required(VERSION 2.8.0) # Compile gtest for test code. execute_process(COMMAND sh build_gtest.sh ${TARGET_PLATFORM} ${PLATFORM_PATH} ${PLATFORM_PATH} WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) +execute_process(COMMAND mkdir ${PLATFORM_PATH}/output_files + WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) +execute_process(COMMAND mkdir ${PLATFORM_PATH}/output_files/libs + WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) +execute_process(COMMAND mkdir ${PLATFORM_PATH}/output_files/libs/external + WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) execute_process(COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgtest.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) execute_process(COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgmock.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a diff --git a/test/utils/McuProtocol/tool/CMakeLists.txt b/test/utils/McuProtocol/tool/CMakeLists.txt index 06461f9..dd22d99 100644 --- a/test/utils/McuProtocol/tool/CMakeLists.txt +++ b/test/utils/McuProtocol/tool/CMakeLists.txt @@ -25,7 +25,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET McuProtocolTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) -target_link_libraries(${TEST_TOOL_TARGET} SharedPtrTest UartDeviceTestTool Log) +target_link_libraries(${TEST_TOOL_TARGET} UartDeviceTestTool Log) if ("${CLANG_TIDY_SUPPORT}" MATCHES "true") add_custom_target(