vendor marisa (#717)

rime · Sep 20, 2023 · 1ca3c3b · 1ca3c3b
1 parent 72a6406
commit 1ca3c3b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 55 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/google/googletest.git
 [submodule "marisa-trie"]
 	path = deps/marisa-trie
-	url = https://github.com/s-yata/marisa-trie.git
+	url = https://github.com/rime/marisa-trie.git
 [submodule "opencc"]
 	path = deps/opencc
 	url = https://github.com/BYVoid/OpenCC.git
diff --git a/build-clang.bat b/build-clang.bat
@@ -118,7 +118,7 @@ if %build_deps% == 1 (
 
   echo building marisa.
   pushd deps\marisa-trie
-  cmake .. %deps_cmake_flags% || exit
+  cmake . %deps_cmake_flags% || exit
   cmake --build build || exit
   cmake --install build || exit
   popd

diff --git a/build.bat b/build.bat
@@ -244,7 +244,7 @@ if %build_deps% == 1 (
 
   echo building marisa.
   pushd deps\marisa-trie
-  cmake .. -B%build_dir% %deps_cmake_flags%
+  cmake . -B%build_dir% %deps_cmake_flags%
   if errorlevel 1 goto error
   cmake --build %build_dir% --config %build_config% --target INSTALL
   if errorlevel 1 goto error

diff --git a/deps.mk b/deps.mk
@@ -50,7 +50,7 @@ leveldb:
 
 marisa:
 	cd $(src_dir)/marisa-trie; \
-	cmake $(src_dir) -B$(build) \
+	cmake . -B$(build) \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_INSTALL_PREFIX:PATH="$(rime_root)" \
 	&& cmake --build $(build) --target install

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
diff --git a/deps/marisa-trie b/deps/marisa-trie