From dd55d9c8c42ec1873af8b8ab91040de7416ca350 Mon Sep 17 00:00:00 2001
From: wyy <wuyanyi09@gmail.com>
Date: Sun, 3 Nov 2013 22:07:26 -0800
Subject: [PATCH] adding Husky

---
 CMakeLists.txt           | 3 +--
 src/CMakeLists.txt       | 3 +++
 src/Husky/CMakeLists.txt | 2 ++
 src/server.cpp           | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee6b75a..2b07f62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,3 @@
 PROJECT(CPPJIEBA)
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(src/Husky)
-ADD_SUBDIRECTORY(src/Limonp)
+ADD_SUBDIRECTORY(src/Husky/Limonp)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0abf5c0..82a804c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,3 +20,6 @@ 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)
 
+
+ADD_SUBDIRECTORY(Husky)
+ADD_SUBDIRECTORY(Limonp)
diff --git a/src/Husky/CMakeLists.txt b/src/Husky/CMakeLists.txt
index 281fd79..a27ad9b 100644
--- a/src/Husky/CMakeLists.txt
+++ b/src/Husky/CMakeLists.txt
@@ -6,3 +6,5 @@ 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)
+
+ADD_SUBDIRECTORY(Limonp)
diff --git a/src/server.cpp b/src/server.cpp
index 20e81ea..412838c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3,9 +3,9 @@
 #include <string>
 #include <ctype.h>
 #include <string.h>
-#include <ArgvContext.hpp>
-#include <Daemon.h>
-#include <ServerFrame.h>
+#include "Husky/Limonp/ArgvContext.hpp"
+#include "Husky/Daemon.h"
+#include "Husky/ServerFrame.h"
 #include "MPSegment.h"
 #include "HMMSegment.h"
 #include "MixSegment.h"