From ef8e1ebaabd12ba43a59484e319bc0ea3270040d Mon Sep 17 00:00:00 2001 From: thucpham Date: Thu, 26 Oct 2023 10:55:13 +0200 Subject: [PATCH] st-2361 [*] connan2 migration --- CMakeLists.txt | 2 +- cli/src/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 +++- test/CMakeLists.txt | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e1601f..9e689fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(FuzzyMatch) cmake_minimum_required(VERSION 3.5.1) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") if(TARGET OpenNMTTokenizer) diff --git a/cli/src/CMakeLists.txt b/cli/src/CMakeLists.txt index 5050fee..38923ee 100644 --- a/cli/src/CMakeLists.txt +++ b/cli/src/CMakeLists.txt @@ -10,5 +10,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC target_link_libraries(${PROJECT_NAME}-cli ${PROJECT_NAME} - ${Boost_LIBRARIES} + Boost::program_options ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d818197..746d385 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC target_link_libraries(${PROJECT_NAME} ${OPENNMT_TOKENIZER_LIB} ${ICU_LIBRARIES} - ${Boost_LIBRARIES} + Boost::serialization + Boost::iostreams + Boost::system Threads::Threads ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 27026d3..f0a9997 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(${PROJECT_NAME}-test test.cc) find_package(GTest REQUIRED) -find_package(Boost COMPONENTS filesystem REQUIRED) +find_package(Boost COMPONENTS filesystem system serialization REQUIRED) include_directories( ${source_dir}/include @@ -17,8 +17,9 @@ target_include_directories(${PROJECT_NAME}-test PUBLIC target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME} GTest::GTest GTest::Main - ${Boost_FILESYSTEM_LIBRARY} - ${GTEST_LIBRARIES} + Boost::filesystem + Boost::serialization + Boost::system ) set(${PROJECT_NAME}-test-args "${CMAKE_CURRENT_LIST_DIR}/data/")