diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b07f62..8983dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,2 @@ PROJECT(CPPJIEBA) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(src/Husky/Limonp) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82a804c..dc867e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) -INCLUDE_DIRECTORIES(./limonp ./husky) - SET(LIBCPPJIEBA_SRC HMMSegment.cpp MixSegment.cpp MPSegment.cpp Trie.cpp) ADD_LIBRARY(cppjieba STATIC ${LIBCPPJIEBA_SRC}) ADD_EXECUTABLE(segment segment.cpp) diff --git a/src/Husky/CMakeLists.txt b/src/Husky/CMakeLists.txt index 6353e4b..281fd79 100644 --- a/src/Husky/CMakeLists.txt +++ b/src/Husky/CMakeLists.txt @@ -6,4 +6,3 @@ ADD_LIBRARY(husky STATIC ${LIBHUSKY_SRC}) INSTALL(TARGETS husky ARCHIVE DESTINATION lib/CppJieba/Husky) INSTALL(FILES Daemon.h globals.h HttpReqInfo.hpp ServerFrame.h ThreadManager.hpp DESTINATION include/CppJieba/Husky) - diff --git a/src/server.cpp b/src/server.cpp index 412838c..c8cd571 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "Husky/Limonp/ArgvContext.hpp" +#include "Limonp/ArgvContext.hpp" #include "Husky/Daemon.h" #include "Husky/ServerFrame.h" #include "MPSegment.h"