diff --git a/build.bat b/build.bat index e93383de4..80e8e2022 100644 --- a/build.bat +++ b/build.bat @@ -81,7 +81,7 @@ if %build_deps% == 0 ( if %clean% == 1 ( rmdir /s /q build - 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 @@ -112,13 +112,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$<$: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 2bcab57ae..ede5330fa 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