Skip to content

Commit

Permalink
Use designated build directory for glog (rime#739)
Browse files Browse the repository at this point in the history
  • Loading branch information
groverlynn authored and graphemecluster committed Oct 16, 2023
1 parent 8f88cb9 commit f7b1527
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.bat
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions deps.mk
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f7b1527

Please sign in to comment.