[Compile] Update glog compiling (#5802)

PaddlePaddle · Mar 29, 2021 · 17d7322 · 17d7322
1 parent c33eb44
commit 17d7322
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "third-party/protobuf-host"]
 	path = third-party/protobuf-host
 	url = https://github.com/protocolbuffers/protobuf.git
+[submodule "third-party/glog"]
+	path = third-party/glog
+	url = https://github.com/google/glog.git
diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake
@@ -14,7 +14,7 @@
 
 INCLUDE(ExternalProject)
 
-SET(GLOG_SOURCES_DIR ${THIRD_PARTY_PATH}/glog)
+SET(GLOG_SOURCES_DIR ${CMAKE_SOURCE_DIR}/third-party/glog)
 SET(GLOG_INSTALL_DIR ${THIRD_PARTY_PATH}/install/glog)
 SET(GLOG_INCLUDE_DIR "${GLOG_INSTALL_DIR}/include" CACHE PATH "glog include directory." FORCE)
 
@@ -44,9 +44,10 @@ ExternalProject_Add(
     extern_glog
     ${EXTERNAL_PROJECT_LOG_ARGS}
     DEPENDS gflags
-    GIT_REPOSITORY  ${GLOG_REPOSITORY}
+    GIT_REPOSITORY  ""
     GIT_TAG         ${GLOG_TAG}
     PREFIX          ${GLOG_SOURCES_DIR}
+    SOURCE_DIR      ${GLOG_SOURCES_DIR}
     UPDATE_COMMAND  ""
     CMAKE_ARGS      ${CROSS_COMPILE_CMAKE_ARGS}
                     ${OPTIONAL_ARGS}

diff --git a/third-party/glog b/third-party/glog