Fix python

k2-fsa · Sep 3, 2023 · 39c0e14 · 39c0e14
1 parent d8bbc6a
commit 39c0e14
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/cmake/sentencepiece.cmake b/cmake/sentencepiece.cmake
@@ -32,12 +32,16 @@ function(download_sentencepiece)
       ${sentencepiece_BINARY_DIR}
   )
 
-  target_include_directories(sentencepiece-static
-    INTERFACE
-      ${sentencepiece_SOURCE_DIR}
-      ${sentencepiece_SOURCE_DIR}/src
-      ${sentencepiece_BINARY_DIR}
-  )
+  if(SHERPA_ONNX_ENABLE_PYTHON AND WIN32)
+    install(TARGETS sentencepiece DESTINATION ..)
+  else()
+    install(TARGETS sentencepiece DESTINATION lib)
+  endif()
+
+  if(WIN32 AND BUILD_SHARED_LIBS)
+    install(TARGETS sentencepiece DESTINATION bin)
+  endif()
+
 endfunction()
 
 download_sentencepiece()
diff --git a/sherpa-onnx/csrc/utf-utils.cc b/sherpa-onnx/csrc/utf-utils.cc
@@ -52,7 +52,7 @@ bool StringToUnicodePoints(const std::string &str,
 std::string CodepointToUTF8String(int32_t code) {
   std::ostringstream ostr;
   if (code < 0) {
-    SHERPA_ONNX_LOGE("Invalid code point : $d", code);
+    SHERPA_ONNX_LOGE("Invalid code point : %d", code);
     exit(-1);
   } else if (code < 0x80) {
     ostr << static_cast<char>(code);

diff --git a/sherpa-onnx/csrc/utils.cc b/sherpa-onnx/csrc/utils.cc
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "sherpa-onnx/csrc/log.h"