diff --git a/CMakeLists.txt b/CMakeLists.txt index ed9215a..efe1585 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,9 @@ PROJECT(CPPJIEBA) CMAKE_MINIMUM_REQUIRED (VERSION 2.6) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/deps + ${PROJECT_SOURCE_DIR}/include) + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set (CMAKE_INSTALL_PREFIX "/usr/local/cppjieba" CACHE PATH "default install path" FORCE ) endif() @@ -16,6 +19,7 @@ endif() # ADD_DEFINITIONS(-DCPPJIEBA_${ENC}) # ENDIF() +ADD_SUBDIRECTORY(deps) ADD_SUBDIRECTORY(server) ADD_SUBDIRECTORY(dict) ADD_SUBDIRECTORY(script) diff --git a/ChangeLog.md b/ChangeLog.md index 88bff01..9393c31 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,14 @@ # CppJieba ChangeLog +## next version + +源码目录布局调整: + +1. src/ -> include/cppjieba/ +2. src/limonp/ -> deps/limonp/ +3. server/husky -> deps/husky/ +4. test/unittest/gtest -> deps/gtest + ## v4.2.1 1. Upgrade [limonp] to version v0.4.1, [husky] to version v0.2.0 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt new file mode 100644 index 0000000..35d6663 --- /dev/null +++ b/deps/CMakeLists.txt @@ -0,0 +1 @@ +ADD_SUBDIRECTORY(gtest) diff --git a/deps/gtest/CMakeLists.txt b/deps/gtest/CMakeLists.txt new file mode 100644 index 0000000..ae1ebad --- /dev/null +++ b/deps/gtest/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE_DIRECTORIES(./ include) +ADD_LIBRARY(gtest STATIC src/gtest-all.cc) +TARGET_LINK_LIBRARIES(gtest pthread) diff --git a/test/unittest/gtest/include/gtest/gtest-death-test.h b/deps/gtest/include/gtest/gtest-death-test.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-death-test.h rename to deps/gtest/include/gtest/gtest-death-test.h diff --git a/test/unittest/gtest/include/gtest/gtest-message.h b/deps/gtest/include/gtest/gtest-message.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-message.h rename to deps/gtest/include/gtest/gtest-message.h diff --git a/test/unittest/gtest/include/gtest/gtest-param-test.h b/deps/gtest/include/gtest/gtest-param-test.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-param-test.h rename to deps/gtest/include/gtest/gtest-param-test.h diff --git a/test/unittest/gtest/include/gtest/gtest-param-test.h.pump b/deps/gtest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-param-test.h.pump rename to deps/gtest/include/gtest/gtest-param-test.h.pump diff --git a/test/unittest/gtest/include/gtest/gtest-printers.h b/deps/gtest/include/gtest/gtest-printers.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-printers.h rename to deps/gtest/include/gtest/gtest-printers.h diff --git a/test/unittest/gtest/include/gtest/gtest-spi.h b/deps/gtest/include/gtest/gtest-spi.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-spi.h rename to deps/gtest/include/gtest/gtest-spi.h diff --git a/test/unittest/gtest/include/gtest/gtest-test-part.h b/deps/gtest/include/gtest/gtest-test-part.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-test-part.h rename to deps/gtest/include/gtest/gtest-test-part.h diff --git a/test/unittest/gtest/include/gtest/gtest-typed-test.h b/deps/gtest/include/gtest/gtest-typed-test.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest-typed-test.h rename to deps/gtest/include/gtest/gtest-typed-test.h diff --git a/test/unittest/gtest/include/gtest/gtest.h b/deps/gtest/include/gtest/gtest.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest.h rename to deps/gtest/include/gtest/gtest.h diff --git a/test/unittest/gtest/include/gtest/gtest_pred_impl.h b/deps/gtest/include/gtest/gtest_pred_impl.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest_pred_impl.h rename to deps/gtest/include/gtest/gtest_pred_impl.h diff --git a/test/unittest/gtest/include/gtest/gtest_prod.h b/deps/gtest/include/gtest/gtest_prod.h similarity index 100% rename from test/unittest/gtest/include/gtest/gtest_prod.h rename to deps/gtest/include/gtest/gtest_prod.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-death-test-internal.h b/deps/gtest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-death-test-internal.h rename to deps/gtest/include/gtest/internal/gtest-death-test-internal.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-filepath.h b/deps/gtest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-filepath.h rename to deps/gtest/include/gtest/internal/gtest-filepath.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-internal.h b/deps/gtest/include/gtest/internal/gtest-internal.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-internal.h rename to deps/gtest/include/gtest/internal/gtest-internal.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-linked_ptr.h b/deps/gtest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-linked_ptr.h rename to deps/gtest/include/gtest/internal/gtest-linked_ptr.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h b/deps/gtest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h rename to deps/gtest/include/gtest/internal/gtest-param-util-generated.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/deps/gtest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h.pump rename to deps/gtest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/test/unittest/gtest/include/gtest/internal/gtest-param-util.h b/deps/gtest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-param-util.h rename to deps/gtest/include/gtest/internal/gtest-param-util.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-port.h b/deps/gtest/include/gtest/internal/gtest-port.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-port.h rename to deps/gtest/include/gtest/internal/gtest-port.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-string.h b/deps/gtest/include/gtest/internal/gtest-string.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-string.h rename to deps/gtest/include/gtest/internal/gtest-string.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-tuple.h b/deps/gtest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-tuple.h rename to deps/gtest/include/gtest/internal/gtest-tuple.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-tuple.h.pump b/deps/gtest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-tuple.h.pump rename to deps/gtest/include/gtest/internal/gtest-tuple.h.pump diff --git a/test/unittest/gtest/include/gtest/internal/gtest-type-util.h b/deps/gtest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-type-util.h rename to deps/gtest/include/gtest/internal/gtest-type-util.h diff --git a/test/unittest/gtest/include/gtest/internal/gtest-type-util.h.pump b/deps/gtest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from test/unittest/gtest/include/gtest/internal/gtest-type-util.h.pump rename to deps/gtest/include/gtest/internal/gtest-type-util.h.pump diff --git a/test/unittest/gtest/src/.deps/.dirstamp b/deps/gtest/src/.deps/.dirstamp similarity index 100% rename from test/unittest/gtest/src/.deps/.dirstamp rename to deps/gtest/src/.deps/.dirstamp diff --git a/test/unittest/gtest/src/.deps/gtest-all.Plo b/deps/gtest/src/.deps/gtest-all.Plo similarity index 100% rename from test/unittest/gtest/src/.deps/gtest-all.Plo rename to deps/gtest/src/.deps/gtest-all.Plo diff --git a/test/unittest/gtest/src/.deps/gtest_main.Plo b/deps/gtest/src/.deps/gtest_main.Plo similarity index 100% rename from test/unittest/gtest/src/.deps/gtest_main.Plo rename to deps/gtest/src/.deps/gtest_main.Plo diff --git a/test/unittest/gtest/src/.dirstamp b/deps/gtest/src/.dirstamp similarity index 100% rename from test/unittest/gtest/src/.dirstamp rename to deps/gtest/src/.dirstamp diff --git a/test/unittest/gtest/src/gtest-all.cc b/deps/gtest/src/gtest-all.cc similarity index 100% rename from test/unittest/gtest/src/gtest-all.cc rename to deps/gtest/src/gtest-all.cc diff --git a/test/unittest/gtest/src/gtest-death-test.cc b/deps/gtest/src/gtest-death-test.cc similarity index 100% rename from test/unittest/gtest/src/gtest-death-test.cc rename to deps/gtest/src/gtest-death-test.cc diff --git a/test/unittest/gtest/src/gtest-filepath.cc b/deps/gtest/src/gtest-filepath.cc similarity index 100% rename from test/unittest/gtest/src/gtest-filepath.cc rename to deps/gtest/src/gtest-filepath.cc diff --git a/test/unittest/gtest/src/gtest-internal-inl.h b/deps/gtest/src/gtest-internal-inl.h similarity index 100% rename from test/unittest/gtest/src/gtest-internal-inl.h rename to deps/gtest/src/gtest-internal-inl.h diff --git a/test/unittest/gtest/src/gtest-port.cc b/deps/gtest/src/gtest-port.cc similarity index 100% rename from test/unittest/gtest/src/gtest-port.cc rename to deps/gtest/src/gtest-port.cc diff --git a/test/unittest/gtest/src/gtest-printers.cc b/deps/gtest/src/gtest-printers.cc similarity index 100% rename from test/unittest/gtest/src/gtest-printers.cc rename to deps/gtest/src/gtest-printers.cc diff --git a/test/unittest/gtest/src/gtest-test-part.cc b/deps/gtest/src/gtest-test-part.cc similarity index 100% rename from test/unittest/gtest/src/gtest-test-part.cc rename to deps/gtest/src/gtest-test-part.cc diff --git a/test/unittest/gtest/src/gtest-typed-test.cc b/deps/gtest/src/gtest-typed-test.cc similarity index 100% rename from test/unittest/gtest/src/gtest-typed-test.cc rename to deps/gtest/src/gtest-typed-test.cc diff --git a/test/unittest/gtest/src/gtest.cc b/deps/gtest/src/gtest.cc similarity index 100% rename from test/unittest/gtest/src/gtest.cc rename to deps/gtest/src/gtest.cc diff --git a/test/unittest/gtest/src/gtest_main.cc b/deps/gtest/src/gtest_main.cc similarity index 100% rename from test/unittest/gtest/src/gtest_main.cc rename to deps/gtest/src/gtest_main.cc diff --git a/server/husky/http_req_info.h b/deps/husky/http_req_info.h similarity index 100% rename from server/husky/http_req_info.h rename to deps/husky/http_req_info.h diff --git a/server/husky/irequest_handler.h b/deps/husky/irequest_handler.h similarity index 100% rename from server/husky/irequest_handler.h rename to deps/husky/irequest_handler.h diff --git a/server/husky/net_util.h b/deps/husky/net_util.h similarity index 100% rename from server/husky/net_util.h rename to deps/husky/net_util.h diff --git a/server/husky/thread_pool_server.h b/deps/husky/thread_pool_server.h similarity index 100% rename from server/husky/thread_pool_server.h rename to deps/husky/thread_pool_server.h diff --git a/server/husky/worker_thread.h b/deps/husky/worker_thread.h similarity index 100% rename from server/husky/worker_thread.h rename to deps/husky/worker_thread.h diff --git a/src/limonp/ArgvContext.hpp b/deps/limonp/ArgvContext.hpp similarity index 100% rename from src/limonp/ArgvContext.hpp rename to deps/limonp/ArgvContext.hpp diff --git a/src/limonp/BlockingQueue.hpp b/deps/limonp/BlockingQueue.hpp similarity index 100% rename from src/limonp/BlockingQueue.hpp rename to deps/limonp/BlockingQueue.hpp diff --git a/src/limonp/BoundedBlockingQueue.hpp b/deps/limonp/BoundedBlockingQueue.hpp similarity index 100% rename from src/limonp/BoundedBlockingQueue.hpp rename to deps/limonp/BoundedBlockingQueue.hpp diff --git a/src/limonp/BoundedQueue.hpp b/deps/limonp/BoundedQueue.hpp similarity index 100% rename from src/limonp/BoundedQueue.hpp rename to deps/limonp/BoundedQueue.hpp diff --git a/src/limonp/Closure.hpp b/deps/limonp/Closure.hpp similarity index 100% rename from src/limonp/Closure.hpp rename to deps/limonp/Closure.hpp diff --git a/src/limonp/Colors.hpp b/deps/limonp/Colors.hpp similarity index 100% rename from src/limonp/Colors.hpp rename to deps/limonp/Colors.hpp diff --git a/src/limonp/Condition.hpp b/deps/limonp/Condition.hpp similarity index 100% rename from src/limonp/Condition.hpp rename to deps/limonp/Condition.hpp diff --git a/src/limonp/Config.hpp b/deps/limonp/Config.hpp similarity index 100% rename from src/limonp/Config.hpp rename to deps/limonp/Config.hpp diff --git a/src/limonp/FileLock.hpp b/deps/limonp/FileLock.hpp similarity index 100% rename from src/limonp/FileLock.hpp rename to deps/limonp/FileLock.hpp diff --git a/src/limonp/LocalVector.hpp b/deps/limonp/LocalVector.hpp similarity index 100% rename from src/limonp/LocalVector.hpp rename to deps/limonp/LocalVector.hpp diff --git a/src/limonp/Logging.hpp b/deps/limonp/Logging.hpp similarity index 100% rename from src/limonp/Logging.hpp rename to deps/limonp/Logging.hpp diff --git a/src/limonp/Md5.hpp b/deps/limonp/Md5.hpp similarity index 100% rename from src/limonp/Md5.hpp rename to deps/limonp/Md5.hpp diff --git a/src/limonp/MutexLock.hpp b/deps/limonp/MutexLock.hpp similarity index 100% rename from src/limonp/MutexLock.hpp rename to deps/limonp/MutexLock.hpp diff --git a/src/limonp/NonCopyable.hpp b/deps/limonp/NonCopyable.hpp similarity index 100% rename from src/limonp/NonCopyable.hpp rename to deps/limonp/NonCopyable.hpp diff --git a/src/limonp/StdExtension.hpp b/deps/limonp/StdExtension.hpp similarity index 100% rename from src/limonp/StdExtension.hpp rename to deps/limonp/StdExtension.hpp diff --git a/src/limonp/StringUtil.hpp b/deps/limonp/StringUtil.hpp similarity index 100% rename from src/limonp/StringUtil.hpp rename to deps/limonp/StringUtil.hpp diff --git a/src/limonp/Thread.hpp b/deps/limonp/Thread.hpp similarity index 100% rename from src/limonp/Thread.hpp rename to deps/limonp/Thread.hpp diff --git a/src/limonp/ThreadPool.hpp b/deps/limonp/ThreadPool.hpp similarity index 100% rename from src/limonp/ThreadPool.hpp rename to deps/limonp/ThreadPool.hpp diff --git a/src/DictTrie.hpp b/include/cppjieba/DictTrie.hpp similarity index 100% rename from src/DictTrie.hpp rename to include/cppjieba/DictTrie.hpp diff --git a/src/FullSegment.hpp b/include/cppjieba/FullSegment.hpp similarity index 100% rename from src/FullSegment.hpp rename to include/cppjieba/FullSegment.hpp diff --git a/src/HMMModel.hpp b/include/cppjieba/HMMModel.hpp similarity index 100% rename from src/HMMModel.hpp rename to include/cppjieba/HMMModel.hpp diff --git a/src/HMMSegment.hpp b/include/cppjieba/HMMSegment.hpp similarity index 100% rename from src/HMMSegment.hpp rename to include/cppjieba/HMMSegment.hpp diff --git a/src/Jieba.hpp b/include/cppjieba/Jieba.hpp similarity index 100% rename from src/Jieba.hpp rename to include/cppjieba/Jieba.hpp diff --git a/src/KeywordExtractor.hpp b/include/cppjieba/KeywordExtractor.hpp similarity index 100% rename from src/KeywordExtractor.hpp rename to include/cppjieba/KeywordExtractor.hpp diff --git a/src/LevelSegment.hpp b/include/cppjieba/LevelSegment.hpp similarity index 100% rename from src/LevelSegment.hpp rename to include/cppjieba/LevelSegment.hpp diff --git a/src/MPSegment.hpp b/include/cppjieba/MPSegment.hpp similarity index 100% rename from src/MPSegment.hpp rename to include/cppjieba/MPSegment.hpp diff --git a/src/MixSegment.hpp b/include/cppjieba/MixSegment.hpp similarity index 100% rename from src/MixSegment.hpp rename to include/cppjieba/MixSegment.hpp diff --git a/src/PosTagger.hpp b/include/cppjieba/PosTagger.hpp similarity index 100% rename from src/PosTagger.hpp rename to include/cppjieba/PosTagger.hpp diff --git a/src/PreFilter.hpp b/include/cppjieba/PreFilter.hpp similarity index 100% rename from src/PreFilter.hpp rename to include/cppjieba/PreFilter.hpp diff --git a/src/QuerySegment.hpp b/include/cppjieba/QuerySegment.hpp similarity index 100% rename from src/QuerySegment.hpp rename to include/cppjieba/QuerySegment.hpp diff --git a/src/SegmentBase.hpp b/include/cppjieba/SegmentBase.hpp similarity index 100% rename from src/SegmentBase.hpp rename to include/cppjieba/SegmentBase.hpp diff --git a/src/TransCode.hpp b/include/cppjieba/TransCode.hpp similarity index 100% rename from src/TransCode.hpp rename to include/cppjieba/TransCode.hpp diff --git a/src/Trie.hpp b/include/cppjieba/Trie.hpp similarity index 100% rename from src/Trie.hpp rename to include/cppjieba/Trie.hpp diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 35d213e..1697231 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -1,7 +1,5 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src) - ADD_EXECUTABLE(cjserver server.cpp) TARGET_LINK_LIBRARIES(cjserver pthread) diff --git a/test/demo.cpp b/test/demo.cpp index b154b34..a45269f 100644 --- a/test/demo.cpp +++ b/test/demo.cpp @@ -1,4 +1,4 @@ -#include "../src/Jieba.hpp" +#include "Jieba.hpp" using namespace std; diff --git a/test/load_test.cpp b/test/load_test.cpp index a218b7f..0a4e51b 100644 --- a/test/load_test.cpp +++ b/test/load_test.cpp @@ -1,11 +1,11 @@ #include #include #include -#include "../src/MPSegment.hpp" -#include "../src/HMMSegment.hpp" -#include "../src/MixSegment.hpp" -#include "../src/KeywordExtractor.hpp" -#include "../src/limonp/Colors.hpp" +#include "cppjieba/MPSegment.hpp" +#include "cppjieba/HMMSegment.hpp" +#include "cppjieba/MixSegment.hpp" +#include "cppjieba/KeywordExtractor.hpp" +#include "limonp/Colors.hpp" using namespace cppjieba; diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 38ddf1e..b81f53a 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -1,11 +1,9 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) -SET(GTEST_ROOT_DIR gtest) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/deps/gtest/include) ADD_DEFINITIONS(-DLOGGER_LEVEL=LL_WARN) -INCLUDE_DIRECTORIES(${GTEST_ROOT_DIR} ${GTEST_ROOT_DIR}/include ${PROJECT_SOURCE_DIR}) -ADD_LIBRARY(gtest STATIC ${GTEST_ROOT_DIR}/src/gtest-all.cc) ADD_EXECUTABLE(test.run gtest_main.cpp @@ -16,6 +14,5 @@ ADD_EXECUTABLE(test.run jieba_test.cpp pre_filter_test.cpp ) -TARGET_LINK_LIBRARIES(gtest pthread) TARGET_LINK_LIBRARIES(test.run gtest pthread) diff --git a/test/unittest/jieba_test.cpp b/test/unittest/jieba_test.cpp index ca98508..4d1730f 100644 --- a/test/unittest/jieba_test.cpp +++ b/test/unittest/jieba_test.cpp @@ -1,4 +1,4 @@ -#include "src/Jieba.hpp" +#include "cppjieba/Jieba.hpp" #include "gtest/gtest.h" using namespace cppjieba; diff --git a/test/unittest/keyword_extractor_test.cpp b/test/unittest/keyword_extractor_test.cpp index 7f5afe2..1e7e60d 100644 --- a/test/unittest/keyword_extractor_test.cpp +++ b/test/unittest/keyword_extractor_test.cpp @@ -1,4 +1,4 @@ -#include "src/KeywordExtractor.hpp" +#include "cppjieba/KeywordExtractor.hpp" #include "gtest/gtest.h" using namespace cppjieba; diff --git a/test/unittest/pos_tagger_test.cpp b/test/unittest/pos_tagger_test.cpp index b182352..5e41fbb 100644 --- a/test/unittest/pos_tagger_test.cpp +++ b/test/unittest/pos_tagger_test.cpp @@ -1,4 +1,4 @@ -#include "src/PosTagger.hpp" +#include "cppjieba/PosTagger.hpp" #include "gtest/gtest.h" using namespace cppjieba; diff --git a/test/unittest/pre_filter_test.cpp b/test/unittest/pre_filter_test.cpp index 4c883e7..082b52a 100644 --- a/test/unittest/pre_filter_test.cpp +++ b/test/unittest/pre_filter_test.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "src/PreFilter.hpp" +#include "cppjieba/PreFilter.hpp" using namespace cppjieba; diff --git a/test/unittest/segments_test.cpp b/test/unittest/segments_test.cpp index 3cf6616..48c6aab 100644 --- a/test/unittest/segments_test.cpp +++ b/test/unittest/segments_test.cpp @@ -1,10 +1,10 @@ -#include "src/SegmentBase.hpp" -#include "src/MixSegment.hpp" -#include "src/MPSegment.hpp" -#include "src/HMMSegment.hpp" -#include "src/FullSegment.hpp" -#include "src/QuerySegment.hpp" -#include "src/LevelSegment.hpp" +#include "cppjieba/SegmentBase.hpp" +#include "cppjieba/MixSegment.hpp" +#include "cppjieba/MPSegment.hpp" +#include "cppjieba/HMMSegment.hpp" +#include "cppjieba/FullSegment.hpp" +#include "cppjieba/QuerySegment.hpp" +#include "cppjieba/LevelSegment.hpp" #include "gtest/gtest.h" using namespace cppjieba; diff --git a/test/unittest/trie_test.cpp b/test/unittest/trie_test.cpp index 33580f9..ea5557a 100644 --- a/test/unittest/trie_test.cpp +++ b/test/unittest/trie_test.cpp @@ -1,5 +1,5 @@ -#include "src/DictTrie.hpp" -#include "src/MPSegment.hpp" +#include "cppjieba/DictTrie.hpp" +#include "cppjieba/MPSegment.hpp" #include "gtest/gtest.h" using namespace cppjieba;