File tree 4 files changed +17
-4
lines changed
4 files changed +17
-4
lines changed Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 3.13 FATAL_ERROR)
2
2
project (sherpa-ncnn)
3
3
4
- set (SHERPA_NCNN_VERSION "1.7 .0" )
4
+ set (SHERPA_NCNN_VERSION "1.8 .0" )
5
5
6
6
# Disable warning about
7
7
#
Original file line number Diff line number Diff line change @@ -46,7 +46,11 @@ function(download_kaldi_native_fbank)
46
46
message (STATUS "kaldi-native-fbank's binary dir is ${kaldi_native_fbank_BINARY_DIR} " )
47
47
48
48
add_subdirectory (${kaldi_native_fbank_SOURCE_DIR} ${kaldi_native_fbank_BINARY_DIR} )
49
- install (TARGETS kaldi-native-fbank-core DESTINATION lib)
49
+ if (SHERPA_NCNN_ENABLE_PYTHON AND WIN32 )
50
+ install (TARGETS kaldi-native-fbank-core DESTINATION ..)
51
+ else ()
52
+ install (TARGETS kaldi-native-fbank-core DESTINATION lib)
53
+ endif ()
50
54
51
55
target_include_directories (kaldi-native-fbank-core
52
56
INTERFACE
Original file line number Diff line number Diff line change @@ -173,7 +173,11 @@ function(download_ncnn)
173
173
message (STATUS "ncnn's binary dir is ${ncnn_BINARY_DIR} " )
174
174
175
175
add_subdirectory (${ncnn_SOURCE_DIR} ${ncnn_BINARY_DIR} )
176
- install (TARGETS ncnn DESTINATION lib)
176
+ if (SHERPA_NCNN_ENABLE_PYTHON AND WIN32 )
177
+ install (TARGETS ncnn DESTINATION ..)
178
+ else ()
179
+ install (TARGETS ncnn DESTINATION lib)
180
+ endif ()
177
181
endfunction ()
178
182
179
183
download_ncnn()
Original file line number Diff line number Diff line change @@ -20,7 +20,12 @@ set(sherpa_ncnn_core_srcs
20
20
)
21
21
add_library (sherpa-ncnn-core ${sherpa_ncnn_core_srcs} )
22
22
target_link_libraries (sherpa-ncnn-core PUBLIC kaldi-native-fbank-core ncnn)
23
- install (TARGETS sherpa-ncnn-core DESTINATION lib)
23
+
24
+ if (SHERPA_NCNN_ENABLE_PYTHON AND WIN32 )
25
+ install (TARGETS sherpa-ncnn-core DESTINATION ..)
26
+ else ()
27
+ install (TARGETS sherpa-ncnn-core DESTINATION lib)
28
+ endif ()
24
29
25
30
if (NOT SHERPA_NCNN_ENABLE_PYTHON)
26
31
if (SHERPA_NCNN_ENABLE_BINARY)
You can’t perform that action at this time.
0 commit comments