@@ -69,7 +69,7 @@ if(ANDROID)
69
69
set (FAST_TOKENIZER_FROM_SOURCES ON )
70
70
else ()
71
71
set (FAST_TOKENIZERS_SUPPORTED ON )
72
- if (USE_ABI0 OR WIN32 AND CMAKE_BUILD_TYPE MATCHES "Debug" )
72
+ if (USE_ABI0 OR ( WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug" ) )
73
73
set (FAST_TOKENIZER_FROM_SOURCES ON )
74
74
else ()
75
75
set (FAST_TOKENIZER_FROM_SOURCES OFF )
@@ -142,7 +142,11 @@ endif()
142
142
143
143
include (FetchContent)
144
144
145
- find_package (sentencepiece QUIET )
145
+ if (NOT USE_ABI0)
146
+ # for ABI=0 case, we have to build from sources
147
+ find_package (sentencepiece QUIET )
148
+ endif ()
149
+
146
150
if (sentencepiece_FOUND)
147
151
find_package (absl REQUIRED)
148
152
else ()
@@ -198,7 +202,9 @@ function(ov_tokenizers_link_sentencepiece TARGET_NAME)
198
202
if (CMAKE_CL_64 )
199
203
target_compile_definitions (sentencepiece-static PRIVATE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS)
200
204
endif ()
205
+ # to propogate _GLIBCXX_USE_CXX11_ABI value
201
206
target_compile_definitions (sentencepiece-static PUBLIC $<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS >)
207
+
202
208
target_link_libraries (${TARGET_NAME} PRIVATE sentencepiece-static )
203
209
if (ANDROID)
204
210
# see https://github.com/protocolbuffers/protobuf/issues/2719#issuecomment-625400968
@@ -221,6 +227,9 @@ function(ov_tokenizers_build_static_re2)
221
227
FetchContent_Populate(re2)
222
228
add_subdirectory (${re2_SOURCE_DIR} ${re2_BINARY_DIR} EXCLUDE_FROM_ALL )
223
229
endif ()
230
+
231
+ # to propogate _GLIBCXX_USE_CXX11_ABI value
232
+ target_compile_definitions (sentencepiece-static PUBLIC $<TARGET_PROPERTY:openvino::runtime,INTERFACE_COMPILE_DEFINITIONS >)
224
233
endfunction ()
225
234
226
235
if (BUILD_FAST_TOKENIZERS)
0 commit comments