From 8c60d4adc0fe248c5056e0537458e3dde9b284b0 Mon Sep 17 00:00:00 2001 From: taoxudonghaha Date: Fri, 18 Dec 2020 14:43:12 +0800 Subject: [PATCH] llt --- cmake/FindModule.cmake | 2 +- cmake/external_libs/gtest.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/FindModule.cmake b/cmake/FindModule.cmake index e7d408b6..d0c85da2 100644 --- a/cmake/FindModule.cmake +++ b/cmake/FindModule.cmake @@ -8,7 +8,7 @@ function(find_module module name path) return() endif() add_library(${module} INTERFACE) - find_library(${module}_LIBRARY_DIR NAMES ${name} PATHS ${path} + find_library(${module}_LIBRARY_DIR NAMES ${name} NAMES_PER_DIR PATHS ${path} PATH_SUFFIXES lib ) diff --git a/cmake/external_libs/gtest.cmake b/cmake/external_libs/gtest.cmake index 15dfb825..303ce464 100755 --- a/cmake/external_libs/gtest.cmake +++ b/cmake/external_libs/gtest.cmake @@ -11,8 +11,7 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR endif() if (GE_PB_PKG) - #set(REQ_URL "${GE_PB_PKG}/libs/gtest/release-1.8.0.tar.gz") - set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.0.tar.gz") + set(REQ_URL "${GE_PB_PKG}/libs/ge_gtest/release-1.8.0.tar.gz") set(MD5 "") elseif (ENABLE_GITEE) set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.0.tar.gz")