Jelajahi Sumber

Fix installing on windows about the python module (#164)

Fangjun Kuang 2 tahun lalu
induk
melakukan
323f708158
4 mengubah file dengan 17 tambahan dan 4 penghapusan
  1. 1 1
      CMakeLists.txt
  2. 5 1
      cmake/kaldi-native-fbank.cmake
  3. 5 1
      cmake/ncnn.cmake
  4. 6 1
      sherpa-ncnn/csrc/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-ncnn)
 
-set(SHERPA_NCNN_VERSION "1.7.0")
+set(SHERPA_NCNN_VERSION "1.8.0")
 
 # Disable warning about
 #

+ 5 - 1
cmake/kaldi-native-fbank.cmake

@@ -46,7 +46,11 @@ function(download_kaldi_native_fbank)
   message(STATUS "kaldi-native-fbank's binary dir is ${kaldi_native_fbank_BINARY_DIR}")
 
   add_subdirectory(${kaldi_native_fbank_SOURCE_DIR} ${kaldi_native_fbank_BINARY_DIR})
-  install(TARGETS kaldi-native-fbank-core DESTINATION lib)
+  if(SHERPA_NCNN_ENABLE_PYTHON AND WIN32)
+    install(TARGETS kaldi-native-fbank-core DESTINATION ..)
+  else()
+    install(TARGETS kaldi-native-fbank-core DESTINATION lib)
+  endif()
 
   target_include_directories(kaldi-native-fbank-core
     INTERFACE

+ 5 - 1
cmake/ncnn.cmake

@@ -173,7 +173,11 @@ function(download_ncnn)
   message(STATUS "ncnn's binary dir is ${ncnn_BINARY_DIR}")
 
   add_subdirectory(${ncnn_SOURCE_DIR} ${ncnn_BINARY_DIR})
-  install(TARGETS ncnn DESTINATION lib)
+  if(SHERPA_NCNN_ENABLE_PYTHON AND WIN32)
+    install(TARGETS ncnn DESTINATION ..)
+  else()
+    install(TARGETS ncnn DESTINATION lib)
+  endif()
 endfunction()
 
 download_ncnn()

+ 6 - 1
sherpa-ncnn/csrc/CMakeLists.txt

@@ -20,7 +20,12 @@ set(sherpa_ncnn_core_srcs
 )
 add_library(sherpa-ncnn-core ${sherpa_ncnn_core_srcs})
 target_link_libraries(sherpa-ncnn-core PUBLIC kaldi-native-fbank-core ncnn)
-install(TARGETS sherpa-ncnn-core DESTINATION lib)
+
+if(SHERPA_NCNN_ENABLE_PYTHON AND WIN32)
+  install(TARGETS sherpa-ncnn-core DESTINATION ..)
+else()
+  install(TARGETS sherpa-ncnn-core DESTINATION lib)
+endif()
 
 if(NOT SHERPA_NCNN_ENABLE_PYTHON)
   if(SHERPA_NCNN_ENABLE_BINARY)