This is an automated email from the ASF dual-hosted git repository. yangzhg pushed a commit to branch libhdfs3 in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
commit 0b34cd4c7f0c84bd82a3d58a54dd0569f65352c0 Author: yangzhg <yangz...@gmail.com> AuthorDate: Mon Jun 6 21:08:02 2022 +0800 opt find gtest --- CMake/FindGoogleTest.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMake/FindGoogleTest.cmake b/CMake/FindGoogleTest.cmake index edfb020..74bc1e5 100644 --- a/CMake/FindGoogleTest.cmake +++ b/CMake/FindGoogleTest.cmake @@ -6,7 +6,8 @@ find_path(GTest_INCLUDE_DIR gtest/gtest.h "/opt/dependency/package/include" "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googletest/include" "/usr/local/include" - "/usr/include") + "/usr/include" + "$ENV{TP_INCLUDE_DIR}") find_path(GMock_INCLUDE_DIR gmock/gmock.h NO_DEFAULT_PATH @@ -14,7 +15,8 @@ find_path(GMock_INCLUDE_DIR gmock/gmock.h "/opt/dependency/package/include" "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googlemock/include" "/usr/local/include" - "/usr/include") + "/usr/include" + "$ENV{TP_INCLUDE_DIR}") find_library(Gtest_LIBRARY NAMES libgtest.a @@ -22,7 +24,8 @@ find_library(Gtest_LIBRARY "/opt/dependency/package/lib" "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/build/googlemock/gtest" "/usr/local/lib" - "/usr/lib") + "/usr/lib" + "$ENV{TP_LIB_DIR}") find_library(Gmock_LIBRARY NAMES libgmock.a @@ -30,7 +33,8 @@ find_library(Gmock_LIBRARY "/opt/dependency/package/lib" "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/build/googlemock" "/usr/local/lib" - "/usr/lib") + "/usr/lib" + "$ENV{TP_LIB_DIR}") message(STATUS "Find GoogleTest include path: ${GTest_INCLUDE_DIR}") message(STATUS "Find GoogleMock include path: ${GMock_INCLUDE_DIR}") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org