From 03d5d3f2c01f372004440636f6d514a017f617a5 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 10:23:10 +0800 Subject: [PATCH 1/6] Add conf to CMakeLists.txt Former-commit-id: 06d485991e06efb84e54e7ba6bbd0ae650442a59 --- cpp/CMakeLists.txt | 8 ++++++-- cpp/unittest/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 27604b6df9..c6b1eede97 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -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) diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt index ab080d92fb..8174971276 100644 --- a/cpp/unittest/CMakeLists.txt +++ b/cpp/unittest/CMakeLists.txt @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------- link_directories( "${CMAKE_BINARY_DIR}/lib" - "${VECWISE_THIRD_PARTY}/lib" + "${VECWISE_THIRD_PARTY_BUILD}/lib" ) set(unittest_srcs From 00fb2e5d47de591132f5af61ceeedb83e4cf57f1 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 10:24:34 +0800 Subject: [PATCH 2/6] Update .gitignore Former-commit-id: 74e9575b39f9c49fd389b18575ccb1466595c899 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f8e7d907bc..56c25e539b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ __pycache__ .env build +cmake-build-debug +cmake_build From 0c4f1cef5df9be6995fae885322f3e7906737433 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 10:25:49 +0800 Subject: [PATCH 3/6] Update Unit test samples Former-commit-id: 7f6a6f38fa33330bbb3d3aac534ee7297f45d824 --- cpp/unittest/log/log_tests.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cpp/unittest/log/log_tests.cpp b/cpp/unittest/log/log_tests.cpp index 483d52da9f..31fa26a62f 100644 --- a/cpp/unittest/log/log_tests.cpp +++ b/cpp/unittest/log/log_tests.cpp @@ -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"); } \ No newline at end of file From ea700add1a81c29d41ac750902108651c1e2dc7b Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 10:54:53 +0800 Subject: [PATCH 4/6] Add faiss-1.5.1 Former-commit-id: 50233b53b5b48edc305a8f58f3f1425025d2fc09 From d6f41656e469f5b07d7d14bd10c57751a63d8a50 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 11:35:44 +0800 Subject: [PATCH 5/6] Fix Makefile error Former-commit-id: f5490fc9e9d2eacff890a8f8a2b1c10372181630 From d1a6d4a8a98b6d47062b3eb17f3a75a3170749c5 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 11:41:24 +0800 Subject: [PATCH 6/6] Remove build Former-commit-id: c0aba23ece9e2b65f033d125b4daedb8527059fd