Skip to content

Commit 280e695

Browse files
committed
Release V2.3.0
2 parents 75ed7b2 + 042fe0f commit 280e695

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4052
-430
lines changed

CMakeLists.txt

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,31 @@ execute_process(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/utils/src/api_schema/
1919
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS utils/src/protobuf/partitionerMessages.proto utils/src/protobuf/pmgdMessages.proto utils/src/protobuf/queryMessage.proto)
2020
add_library(vdms_protobuf SHARED ${PROTO_SRCS} ${PROTO_HDRS})
2121

22-
add_subdirectory(src/pmgd)
23-
add_subdirectory(utils)
24-
add_subdirectory(tests)
25-
add_subdirectory(src/vcl)
26-
add_subdirectory(client/cpp)
27-
add_subdirectory(ext/custom_vcl)
28-
link_directories(/usr/local/lib /usr/lib/x86_64-linux-gnu/)
29-
include_directories(/usr/include/jsoncpp utils/include/ src/pmgd/include src/pmgd/util include/ src/vcl ${CMAKE_CURRENT_BINARY_DIR}/utils/src/protobuf)
30-
add_library(dms SHARED src/BoundingBoxCommand.cc src/CommunicationManager.cc src/DescriptorsCommand.cc src/DescriptorsManager.cc src/ExceptionsCommand.cc src/ImageCommand.cc src/PMGDIterators.cc src/PMGDQuery.cc src/PMGDQueryHandler.cc src/QueryHandler.cc src/QueryMessage.cc src/RSCommand.cc src/SearchExpression.cc src/Server.cc src/VDMSConfig.cc src/VideoCommand.cc src/AutoDeleteNode.cc ${PROTO_SRCS} ${PROTO_HDRS})
31-
target_link_libraries(dms vcl pmgd pmgd-util protobuf vdms-utils pthread)
32-
33-
add_executable(vdms src/vdms.cc)
34-
target_link_libraries(vdms dms vdms_protobuf vcl tiledb faiss jsoncpp ${OpenCV_LIBS})
22+
option(CLIENT "Built client library." OFF)
23+
if (CLIENT)
24+
add_definitions("-D CLIENT")
25+
26+
include_directories(client/cpp)
27+
include_directories(utils)
28+
add_subdirectory(utils)
29+
add_subdirectory(client/cpp)
30+
31+
32+
else()
33+
add_subdirectory(src/pmgd)
34+
add_subdirectory(utils)
35+
add_subdirectory(tests)
36+
add_subdirectory(src/vcl)
37+
add_subdirectory(client/cpp)
38+
add_subdirectory(ext/custom_vcl)
39+
add_subdirectory(distributed)
40+
41+
link_directories(/usr/local/lib /usr/lib/x86_64-linux-gnu/)
42+
include_directories(/usr/include/jsoncpp utils/include/ src/pmgd/include src/pmgd/util include/ src/vcl /usr/include ${CMAKE_CURRENT_BINARY_DIR}/utils/src/protobuf)
43+
add_library(dms SHARED src/BoundingBoxCommand.cc src/CommunicationManager.cc src/DescriptorsCommand.cc src/DescriptorsManager.cc src/ExceptionsCommand.cc src/ImageCommand.cc src/PMGDIterators.cc src/PMGDQuery.cc src/PMGDQueryHandler.cc src/QueryHandler.cc src/QueryMessage.cc src/RSCommand.cc src/SearchExpression.cc src/Server.cc src/VDMSConfig.cc src/VideoCommand.cc src/AutoDeleteNode.cc ${PROTO_SRCS} ${PROTO_HDRS})
44+
target_link_libraries(dms vcl pmgd pmgd-util protobuf vdms-utils pthread)
45+
46+
47+
add_executable(vdms src/vdms.cc)
48+
target_link_libraries(vdms dms vdms_protobuf vcl tiledb faiss flinng jsoncpp ${OpenCV_LIBS})
49+
endif ()

0 commit comments

Comments
 (0)