From b4c185f7d0fa9498ed85666985d3740fe5c9e707 Mon Sep 17 00:00:00 2001 From: Taku Kudo Date: Tue, 11 Dec 2018 00:24:18 +0900 Subject: [PATCH] added third_party as a subdir of cmake --- .gitignore | 4 ++++ CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- third_party/CMakeLists.txt | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 third_party/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 28a415f..c839c85 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,7 @@ dist/ m.model m.vocab + +cmake_install.cmake +libsentencepiece.so* +libsentencepiece_train.so* diff --git a/CMakeLists.txt b/CMakeLists.txt index ca45178..dc99a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ option(SPM_NO_THREADLOCAL "Disable thread_local operator" OFF) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir "\${exec_prefix}/lib") @@ -86,6 +85,7 @@ if (SPM_BUILD_TEST) endif() add_subdirectory(src) +add_subdirectory(third_party) set(CPACK_SOURCE_GENERATOR "TXZ") set(CPACK_GENERATOR "7Z") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebfcaa6..4703750 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,7 +51,7 @@ set(SPM_SRCS unigram_model.cc util.cc word_model.cc - ../third_party/absl/strings/string_view.cc) + ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/absl/strings/string_view.cc) set(SPM_TRAIN_SRCS ${SPM_PROTO_HDRS} diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt new file mode 100644 index 0000000..2529e53 --- /dev/null +++ b/third_party/CMakeLists.txt @@ -0,0 +1 @@ +include_directories(absl/strings darts_clone esaxx)