admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jinhai' of 192.168.1.105:jinhai/vecwise_engine into jinhai

Browse Source 
Former-commit-id: 9d9371678e5760b443b8c69e34c9f7d9e7735a37
This commit is contained in:
groot 2019-04-14 14:32:54 +08:00
commit 53617bd8d3
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ __pycache__
.env
build
cmake-build-debug
cmake_build

8
cpp/CMakeLists.txt
View File

@ -43,13 +43,17 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODUL
set(VECWISE_ENGINE_INCLUDE ${PROJECT_SOURCE_DIR}/include)
set(VECWISE_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)
set(VECWISE_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build)
set(VECWISE_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
set(VECWISE_THIRD_PARTY_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build)
add_compile_definitions(PROFILER=${PROFILER})
include_directories(${VECWISE_ENGINE_INCLUDE})
include_directories(${VECWISE_ENGINE_SRC})
include_directories(${VECWISE_THIRD_PARTY}/include)
include_directories(${VECWISE_THIRD_PARTY_BUILD}/include)
execute_process(COMMAND bash build.sh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
add_subdirectory(src)

2
cpp/unittest/CMakeLists.txt
View File

@ -5,7 +5,7 @@
#-------------------------------------------------------------------------------
link_directories(
"${CMAKE_BINARY_DIR}/lib"
"${VECWISE_THIRD_PARTY}/lib"
"${VECWISE_THIRD_PARTY_BUILD}/lib"
)
set(unittest_srcs

8
cpp/unittest/log/log_tests.cpp
View File

@ -8,4 +8,12 @@
TEST(LogTest, INIT_TEST) {
ASSERT_STREQ("A", "A");
}
TEST(LogTest, RUN_TEST) {
ASSERT_STREQ("B", "B");
}
TEST(LogTest, FINISH_TEST) {
ASSERT_STREQ("C", "C");
}