Skip to content

Commit 5243127

Browse files
authored
[Compile]Update glog compiling #5803
1 parent 4fc26f7 commit 5243127

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
[submodule "third-party/protobuf-host"]
1111
path = third-party/protobuf-host
1212
url = https://github.com/protocolbuffers/protobuf.git
13+
[submodule "third-party/glog"]
14+
path = third-party/glog
15+
url = https://github.com/google/glog.git

cmake/external/glog.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
INCLUDE(ExternalProject)
1616

17-
SET(GLOG_SOURCES_DIR ${THIRD_PARTY_PATH}/glog)
17+
SET(GLOG_SOURCES_DIR ${CMAKE_SOURCE_DIR}/third-party/glog)
1818
SET(GLOG_INSTALL_DIR ${THIRD_PARTY_PATH}/install/glog)
1919
SET(GLOG_INCLUDE_DIR "${GLOG_INSTALL_DIR}/include" CACHE PATH "glog include directory." FORCE)
2020

@@ -44,9 +44,10 @@ ExternalProject_Add(
4444
extern_glog
4545
${EXTERNAL_PROJECT_LOG_ARGS}
4646
DEPENDS gflags
47-
GIT_REPOSITORY ${GLOG_REPOSITORY}
47+
GIT_REPOSITORY ""
4848
GIT_TAG ${GLOG_TAG}
4949
PREFIX ${GLOG_SOURCES_DIR}
50+
SOURCE_DIR ${GLOG_SOURCES_DIR}
5051
UPDATE_COMMAND ""
5152
CMAKE_ARGS ${CROSS_COMPILE_CMAKE_ARGS}
5253
${OPTIONAL_ARGS}

third-party/glog

Submodule glog added at a6a166d

0 commit comments

Comments
 (0)