File tree 2 files changed +7
-3
lines changed
2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ include_directories( third_party/eigen )
98
98
include_directories ( third_party/json/include )
99
99
include_directories ( third_party/streamvbyte/include )
100
100
add_subdirectory ( third_party/streamvbyte )
101
- set ( STREAMBYTE_OBJECTS
101
+ set ( STREAMVBYTE_OBJECTS
102
102
$<TARGET_OBJECTS:streamvbyte>
103
103
)
104
104
if (KIWI_USE_CPUINFO)
@@ -223,14 +223,14 @@ add_library( "${PROJECT_NAME}_static" STATIC
223
223
${CORE_SRCS}
224
224
src/capi/kiwi_c.cpp
225
225
${CPUINFO_OBJECTS_STATIC}
226
- ${STREAMBYTE_OBJECTS }
226
+ ${STREAMVBYTE_OBJECTS }
227
227
)
228
228
229
229
add_library ( "${PROJECT_NAME} " SHARED
230
230
${CORE_SRCS}
231
231
src/capi/kiwi_c.cpp
232
232
${CPUINFO_OBJECTS_SHARED}
233
- ${STREAMBYTE_OBJECTS }
233
+ ${STREAMVBYTE_OBJECTS }
234
234
)
235
235
236
236
# Install the kiwi library as well as header files to (`include/kiwi` directory)
@@ -299,6 +299,9 @@ if(MSVC)
299
299
target_compile_options ("${PROJECT_NAME} _static" PUBLIC
300
300
/MT
301
301
)
302
+ target_compile_options ("streamvbyte" PUBLIC
303
+ /MT
304
+ )
302
305
endif ()
303
306
304
307
target_compile_options ("${PROJECT_NAME} " PUBLIC
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ set(pkg_name "KiwiJava-${PROJECT_VERSION}")
10
10
add_library (${pkg_name} SHARED kiwi_java.cpp
11
11
$<TARGET_OBJECTS:${PROJECT_NAME} >
12
12
$<TARGET_OBJECTS:cpuinfo>
13
+ $<TARGET_OBJECTS:streamvbyte>
13
14
)
14
15
if (UNIX AND NOT APPLE )
15
16
target_link_libraries ( ${pkg_name}
You can’t perform that action at this time.
0 commit comments