From 1f4eae5bbc532bc5281d473ea9746f0d5af45615 Mon Sep 17 00:00:00 2001
From: wyy <wuyanyi09@gmail.com>
Date: Sun, 3 Nov 2013 08:47:50 -0800
Subject: [PATCH] modify cmakelists.txt

---
 CMakeLists.txt           |  8 ++++----
 dicts/CMakeLists.txt     |  1 +
 src/CMakeLists.txt       | 24 ++++++++++++++----------
 src/husky/CMakeLists.txt |  3 +++
 src/segment.cpp          |  6 +++---
 src/server.cpp           | 10 +++++-----
 6 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 dicts/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2273c21..f1d81d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT(CPPJIEBA)
-ADD_SUBDIRECTORY(cppjieba)
-ADD_SUBDIRECTORY(husky)
-ADD_SUBDIRECTORY(limonp)
-ADD_SUBDIRECTORY(demo)
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(src/husky)
+ADD_SUBDIRECTORY(src/limonp)
+ADD_SUBDIRECTORY(dicts)
diff --git a/dicts/CMakeLists.txt b/dicts/CMakeLists.txt
new file mode 100644
index 0000000..4fb1e46
--- /dev/null
+++ b/dicts/CMakeLists.txt
@@ -0,0 +1 @@
+INSTALL(FILES  hmm_model.gbk  hmm_model.utf8  jieba.dict.gbk  jieba.dict.utf8 DESTINATION include/CppJieba/Dicts)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22615bb..207d63f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,18 +1,22 @@
-ADD_EXECUTABLE(segment.demo segment.cpp)
-ADD_EXECUTABLE(server.demo server.cpp)
-ADD_EXECUTABLE(keywordext.demo keywordext.cpp)
-INCLUDE_DIRECTORIES(../limonp ../cppjieba ../husky)
-LINK_DIRECTORIES(../cppjieba ../husky)
-TARGET_LINK_LIBRARIES(segment.demo cppjieba)
-TARGET_LINK_LIBRARIES(server.demo cppjieba husky pthread)
+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)
-
-INCLUDE_DIRECTORIES(../limonp)
-
 ADD_LIBRARY(cppjieba SHARED ${LIBCPPJIEBA_SRC})
+ADD_EXECUTABLE(segment segment.cpp)
+ADD_EXECUTABLE(server server.cpp)
+
+LINK_DIRECTORIES(husky)
+
+TARGET_LINK_LIBRARIES(segment cppjieba)
+TARGET_LINK_LIBRARIES(server cppjieba husky pthread)
 
 SET_TARGET_PROPERTIES(cppjieba PROPERTIES VERSION 1.2 SOVERSION 1)
 
 INSTALL(TARGETS cppjieba LIBRARY DESTINATION lib/CppJieba)
+INSTALL(TARGETS segment RUNTIME DESTINATION bin/CppJieba)
+INSTALL(TARGETS server RUNTIME DESTINATION bin/CppJieba)
 INSTALL(FILES ChineseFilter.hpp HMMSegment.h MPSegment.h structs.h Trie.h globals.h ISegment.hpp  MixSegment.h  SegmentBase.hpp  TransCode.hpp  DESTINATION include/CppJieba)
+
diff --git a/src/husky/CMakeLists.txt b/src/husky/CMakeLists.txt
index d77435d..bf08ee9 100644
--- a/src/husky/CMakeLists.txt
+++ b/src/husky/CMakeLists.txt
@@ -1,3 +1,6 @@
+
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+
 SET(LIBHUSKY_SRC Daemon.cpp ServerFrame.cpp)
 INCLUDE_DIRECTORIES(../limonp)
 ADD_LIBRARY(husky SHARED ${LIBHUSKY_SRC})
diff --git a/src/segment.cpp b/src/segment.cpp
index 218fb1a..5445ec0 100644
--- a/src/segment.cpp
+++ b/src/segment.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 #include <fstream>
 #include <ArgvContext.hpp>
-#include "../cppjieba/MPSegment.h"
-#include "../cppjieba/HMMSegment.h"
-#include "../cppjieba/MixSegment.h"
+#include "MPSegment.h"
+#include "HMMSegment.h"
+#include "MixSegment.h"
 
 using namespace CppJieba;
 
diff --git a/src/server.cpp b/src/server.cpp
index 428c602..20e81ea 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4,11 +4,11 @@
 #include <ctype.h>
 #include <string.h>
 #include <ArgvContext.hpp>
-#include "../husky/Daemon.h"
-#include "../husky/ServerFrame.h"
-#include "../cppjieba/MPSegment.h"
-#include "../cppjieba/HMMSegment.h"
-#include "../cppjieba/MixSegment.h"
+#include <Daemon.h>
+#include <ServerFrame.h>
+#include "MPSegment.h"
+#include "HMMSegment.h"
+#include "MixSegment.h"
 
 using namespace Husky;
 using namespace CppJieba;