Skip to content

Commit fceebba

Browse files
committed
Fix MSVC UTF-8 and core interface link deps
1 parent 9258982 commit fceebba

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

cmake/bazel.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
453453
"$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-Wshadow>"
454454
"$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-Wshadow>"
455455
"$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-Wshadow-local;-Wno-misleading-indentation>"
456-
"$<$<CXX_COMPILER_ID:MSVC>:/W4>"
456+
"$<$<CXX_COMPILER_ID:MSVC>:/W4;/utf-8>"
457457
${BAZEL_CC_ASAN_COMPILE_FLAGS}
458458
${BAZEL_CC_COVERAGE_COMPILE_FLAGS}
459459
)
@@ -463,7 +463,7 @@ else()
463463
"$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-Wshadow>"
464464
"$<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-Wshadow>"
465465
"$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-Wshadow;-Wno-misleading-indentation>"
466-
"$<$<CXX_COMPILER_ID:MSVC>:/W4>"
466+
"$<$<CXX_COMPILER_ID:MSVC>:/W4;/utf-8>"
467467
${BAZEL_CC_ASAN_COMPILE_FLAGS}
468468
${BAZEL_CC_COVERAGE_COMPILE_FLAGS}
469469
)
@@ -484,7 +484,7 @@ set(
484484
"$<$<CXX_COMPILER_ID:Clang>:-Wall>"
485485
"$<$<CXX_COMPILER_ID:AppleClang>:-Wall>"
486486
"$<$<CXX_COMPILER_ID:GNU>:-Wall>"
487-
"$<$<CXX_COMPILER_ID:MSVC>:/W3>"
487+
"$<$<CXX_COMPILER_ID:MSVC>:/W3;/utf-8>"
488488
${BAZEL_CC_ASAN_COMPILE_FLAGS}
489489
${BAZEL_CC_COVERAGE_COMPILE_FLAGS}
490490
)

src/core/interface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ cc_library(
55
NAME core_interface STATIC STRICT ALWAYS_LINK
66
SRCS *.cc indexes/*.cc
77
INCS . ${PROJECT_ROOT_DIR}/src/include ${PROJECT_ROOT_DIR}/src/ ${PROJECT_ROOT_DIR}/src/core ${PROJECT_ROOT_DIR}/thirdparty/omega/OMEGALib/include
8-
LIBS zvec_ailego core_framework core_mix_reducer sparsehash magic_enum rabitqlib
8+
LIBS zvec_ailego core_framework core_mix_reducer core_knn_omega core_knn_hnsw_rabitq sparsehash magic_enum rabitqlib
99
VERSION "${PROXIMA_ZVEC_VERSION}"
1010
)

tests/core/algorithm/omega/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ foreach(CC_SRCS ${ALL_TEST_SRCS})
88
NAME ${CC_TARGET}
99
STRICT
1010
LIBS zvec_ailego core_framework core_utility core_metric core_quantizer
11-
core_knn_hnsw core_knn_flat core_knn_omega core_interface
11+
core_knn_hnsw core_knn_hnsw_rabitq core_knn_flat core_knn_omega core_interface
1212
core_mix_reducer omega
1313
SRCS ${CC_SRCS}
1414
INCS . ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/algorithm

0 commit comments

Comments
 (0)