From 5d06d53acee52c94ce99261ae7ec7ee739340a25 Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Sat, 2 Dec 2023 15:30:05 -0800 Subject: [PATCH] Improve external lib build. --- test/CMakeLists.txt | 28 ++++++++++++++++++++++++ test/all/CMakeLists.txt | 1 - test/hal/CMakeLists.txt | 3 +-- test/middleware/IpcConfig/CMakeLists.txt | 1 - test/utils/Config/CMakeLists.txt | 2 -- test/utils/Log/CMakeLists.txt | 3 +-- test/utils/SharedData/CMakeLists.txt | 3 +-- 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 52ef2473..4a4fa277 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,6 +5,34 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_LINUX_MOCK}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_LINUX_MOCK}") # 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 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 + WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/) + +# build gtest and gmock +# add_custom_command( +# OUTPUT ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a +# OUTPUT ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a +# COMMAND echo "Build google test for test code." +# COMMAND sh build_gtest.sh ${TARGET_PLATFORM} ${PLATFORM_PATH} ${PLATFORM_PATH} +# COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgtest.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a +# COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgmock.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a +# WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/ +# ) +# # add_custom_target( +# # google_test +# # DEPENDS libgtest.a libgmock.a +# # ) +# add_custom_target( +# libgtest.a +# DEPENDS ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a +# ) +# add_custom_target( +# libgmock.a +# DEPENDS ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a +# ) + # add_subdirectory(test_utils) add_subdirectory(middleware) add_subdirectory(utils) diff --git a/test/all/CMakeLists.txt b/test/all/CMakeLists.txt index db0bc040..83d53c43 100644 --- a/test/all/CMakeLists.txt +++ b/test/all/CMakeLists.txt @@ -14,7 +14,6 @@ include_directories( ) link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} ${EXTERNAL_LIBS_OUTPUT_PATH} ) diff --git a/test/hal/CMakeLists.txt b/test/hal/CMakeLists.txt index 0a533592..0841d634 100644 --- a/test/hal/CMakeLists.txt +++ b/test/hal/CMakeLists.txt @@ -10,9 +10,8 @@ include_directories( ) link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} + ${EXTERNAL_LIBS_OUTPUT_PATH} ) set(CMAKE_AUTOMOC ON) diff --git a/test/middleware/IpcConfig/CMakeLists.txt b/test/middleware/IpcConfig/CMakeLists.txt index 00faeb97..ffdb30cd 100644 --- a/test/middleware/IpcConfig/CMakeLists.txt +++ b/test/middleware/IpcConfig/CMakeLists.txt @@ -14,7 +14,6 @@ include_directories( ) link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} ${EXTERNAL_LIBS_OUTPUT_PATH} ) diff --git a/test/utils/Config/CMakeLists.txt b/test/utils/Config/CMakeLists.txt index 3a526307..d0203ef0 100644 --- a/test/utils/Config/CMakeLists.txt +++ b/test/utils/Config/CMakeLists.txt @@ -14,8 +14,6 @@ include_directories( ) message("=========================================${EXTERNAL_LIBS_OUTPUT_PATH}") link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} ${EXTERNAL_LIBS_OUTPUT_PATH} ) diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt index 9ee59070..53a229df 100644 --- a/test/utils/Log/CMakeLists.txt +++ b/test/utils/Log/CMakeLists.txt @@ -12,9 +12,8 @@ include_directories( ) link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} + ${EXTERNAL_LIBS_OUTPUT_PATH} ) set(CMAKE_AUTOMOC ON) diff --git a/test/utils/SharedData/CMakeLists.txt b/test/utils/SharedData/CMakeLists.txt index 7e81c406..4b7782b5 100644 --- a/test/utils/SharedData/CMakeLists.txt +++ b/test/utils/SharedData/CMakeLists.txt @@ -11,9 +11,8 @@ include_directories( ) link_directories( - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib - ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib ${LIBS_OUTPUT_PATH} + ${EXTERNAL_LIBS_OUTPUT_PATH} ) set(CMAKE_AUTOMOC ON)