From f7b1527d20343f0c3b4aa63d3ef9258836ecc69f Mon Sep 17 00:00:00 2001
From: groverlynn <groverlynn@gmail.com>
Date: Mon, 16 Oct 2023 23:37:46 +0200
Subject: [PATCH] Use designated build directory for glog (#739)

---
 build.bat | 6 +++---
 deps.mk   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.bat b/build.bat
index 29c79fc6e9..11ab4df1e3 100644
--- a/build.bat
+++ b/build.bat
@@ -83,7 +83,7 @@ if %clean% == 1 (
   md .temp
   robocopy .temp build /nocopy /purge /xd bin
   rmdir /s /q .temp
-  rmdir /s /q deps\glog\cmake-build
+  rmdir /s /q deps\glog\build
   rmdir /s /q deps\googletest\build
   rmdir /s /q deps\leveldb\build
   rmdir /s /q deps\marisa-trie\build
@@ -114,13 +114,13 @@ set deps_cmake_flags=%common_cmake_flags%^
 if %build_deps% == 1 (
   echo building glog.
   pushd deps\glog
-  cmake . -Bcmake-%build_dir% %deps_cmake_flags%^
+  cmake . -B%build_dir% %deps_cmake_flags%^
   -DBUILD_SHARED_LIBS:BOOL=OFF^
   -DBUILD_TESTING:BOOL=OFF^
   -DWITH_GFLAGS:BOOL=OFF^
   -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>"
   if errorlevel 1 goto error
-  cmake --build cmake-%build_dir% --config %build_config% --target install
+  cmake --build %build_dir% --config %build_config% --target install
   if errorlevel 1 goto error
   popd
 
diff --git a/deps.mk b/deps.mk
index 2bcab57ae7..ede5330faf 100644
--- a/deps.mk
+++ b/deps.mk
@@ -7,7 +7,6 @@ ifndef NOPARALLEL
 export MAKEFLAGS+=" -j$(( $(nproc) + 1)) "
 endif
 
-glog: build ?= cmake-build
 build ?= build
 
 rime_deps = glog gtest leveldb marisa opencc yaml-cpp
@@ -18,7 +17,7 @@ all: $(rime_deps)
 
 # note: this won't clean output files under include/, lib/ and bin/.
 clean-src:
-	rm -r $(src_dir)/glog/cmake-build || true
+	rm -r $(src_dir)/glog/build || true
 	rm -r $(src_dir)/googletest/build || true
 	rm -r $(src_dir)/leveldb/build || true
 	rm -r $(src_dir)/marisa-trie/build || true