Skip to content

Commit 8be959b

Browse files
committed
Fix CMakeLists.txt
1 parent 5a5e076 commit 8be959b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Diff for: CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ include_directories( third_party/eigen )
9898
include_directories( third_party/json/include )
9999
include_directories( third_party/streamvbyte/include )
100100
add_subdirectory( third_party/streamvbyte )
101-
set ( STREAMBYTE_OBJECTS
101+
set ( STREAMVBYTE_OBJECTS
102102
$<TARGET_OBJECTS:streamvbyte>
103103
)
104104
if(KIWI_USE_CPUINFO)
@@ -223,14 +223,14 @@ add_library( "${PROJECT_NAME}_static" STATIC
223223
${CORE_SRCS}
224224
src/capi/kiwi_c.cpp
225225
${CPUINFO_OBJECTS_STATIC}
226-
${STREAMBYTE_OBJECTS}
226+
${STREAMVBYTE_OBJECTS}
227227
)
228228

229229
add_library( "${PROJECT_NAME}" SHARED
230230
${CORE_SRCS}
231231
src/capi/kiwi_c.cpp
232232
${CPUINFO_OBJECTS_SHARED}
233-
${STREAMBYTE_OBJECTS}
233+
${STREAMVBYTE_OBJECTS}
234234
)
235235

236236
# Install the kiwi library as well as header files to (`include/kiwi` directory)
@@ -299,6 +299,9 @@ if(MSVC)
299299
target_compile_options("${PROJECT_NAME}_static" PUBLIC
300300
/MT
301301
)
302+
target_compile_options("streamvbyte" PUBLIC
303+
/MT
304+
)
302305
endif()
303306

304307
target_compile_options("${PROJECT_NAME}" PUBLIC

Diff for: bindings/java/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ set(pkg_name "KiwiJava-${PROJECT_VERSION}")
1010
add_library (${pkg_name} SHARED kiwi_java.cpp
1111
$<TARGET_OBJECTS:${PROJECT_NAME}>
1212
$<TARGET_OBJECTS:cpuinfo>
13+
$<TARGET_OBJECTS:streamvbyte>
1314
)
1415
if(UNIX AND NOT APPLE)
1516
target_link_libraries( ${pkg_name}

0 commit comments

Comments
 (0)