From da3342da8fc2e0506893bec354f8e92b68725181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Sat, 5 Nov 2022 00:00:00 +0000 Subject: [PATCH] [3party] Optionally allow building with packaged protobuf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Géczi --- CMakeLists.txt | 4 ++++ indexer/CMakeLists.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b37ef68d63..2fc9a7f12a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -315,7 +315,11 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) add_subdirectory(3party/jansson/jansson/) target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include") + # Add pugixml library. add_subdirectory(3party/pugixml) + + # Add protobuf library. + add_subdirectory(${OMIM_ROOT}/3party/protobuf) endif() add_subdirectory(3party/agg) diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt index c7298f9e08..75aa541976 100644 --- a/indexer/CMakeLists.txt +++ b/indexer/CMakeLists.txt @@ -149,8 +149,6 @@ file(COPY ${OTHER_FILES} DESTINATION ${CMAKE_BINARY_DIR}) omim_add_library(${PROJECT_NAME} ${SRC}) -add_subdirectory(${OMIM_ROOT}/3party/protobuf ${CMAKE_CURRENT_BINARY_DIR}/protobuf) - target_link_libraries(${PROJECT_NAME} search # search::DummyRankTable in CachingRankTableLoader platform