Skip to content

Commit 3b473ab

Browse files
authored
feat: upgrade glog to 0.6.0 (#3704)
1 parent ff7e8ac commit 3b473ab

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

third-party/cmake/FetchGlog.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
set(GLOG_URL https://github.com/google/glog/archive/refs/tags/v0.4.0.tar.gz)
15+
set(GLOG_URL https://github.com/google/glog/archive/refs/tags/v0.6.0.tar.gz)
1616

1717
message(STATUS "build glog from ${GLOG_URL}")
1818

1919
find_program(MAKE_EXE NAMES gmake nmake make)
2020
ExternalProject_Add(
2121
glog
2222
URL ${GLOG_URL}
23-
URL_HASH SHA256=f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c
23+
URL_HASH SHA256=8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6
2424
PREFIX ${DEPS_BUILD_DIR}
2525
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/glog
2626
INSTALL_DIR ${DEPS_INSTALL_DIR}
2727
DEPENDS gflags
2828
BUILD_IN_SOURCE TRUE
29-
CONFIGURE_COMMAND
30-
./autogen.sh
31-
COMMAND CXXFLAGS=-fPIC ./configure --prefix=<INSTALL_DIR> --enable-shared=no --with-gflags=<INSTALL_DIR>
32-
BUILD_COMMAND ${MAKE_EXE}
33-
INSTALL_COMMAND ${MAKE_EXE} install)
29+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -H<SOURCE_DIR> -B <BINARY_DIR> -DCMAKE_CXX_FLAGS=-fPIC
30+
-DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
31+
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> -- ${MAKEOPTS}
32+
INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install)

0 commit comments

Comments
 (0)