diff --git a/ChangeLog.md b/ChangeLog.md index 4263582..fc79930 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,7 @@ 1. 适配更低级版本的`g++`和`cmake`,已在`g++ 4.1.2`和`cmake 2.6`上测试通过。 2. 修改一些测试用例的文件,减少测试时编译的时间。 +3. 修复`make install`相关的问题。 ## v2.3.4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cc83df..5fc6ee9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,4 @@ TARGET_LINK_LIBRARIES(cjserver pthread) INSTALL(TARGETS cjsegment RUNTIME DESTINATION bin) INSTALL(TARGETS cjserver RUNTIME DESTINATION bin) -INSTALL(FILES HMMSegment.hpp MPSegment.hpp Trie.hpp TrieManager.hpp ISegment.hpp MixSegment.hpp SegmentBase.hpp TransCode.hpp KeywordExtractor.hpp DESTINATION include/CppJieba) -ADD_SUBDIRECTORY(Husky) -ADD_SUBDIRECTORY(Limonp) diff --git a/src/Husky/CMakeLists.txt b/src/Husky/CMakeLists.txt deleted file mode 100644 index 2c86c04..0000000 --- a/src/Husky/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) - -FILE(GLOB SRCS *.hpp) -INSTALL(FILES ${SRCS} DESTINATION include/CppJieba/Husky) diff --git a/src/Limonp/CMakeLists.txt b/src/Limonp/CMakeLists.txt deleted file mode 100644 index 8d57ecb..0000000 --- a/src/Limonp/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -INSTALL(FILES ArgvContext.hpp InitOnOff.hpp macro_def.hpp MysqlClient.hpp str_functs.hpp - cast_functs.hpp io_functs.hpp map_functs.hpp NonCopyable.hpp - Config.hpp logger.hpp md5.hpp std_outbound.hpp - DESTINATION include/CppJieba/Limonp)