synchronize CMake rules to match Makefile.am

5 files changed, 36 insertions, 20 deletions

diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
index 79da024..60d7d4c 100644
--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(
     LIBPINYIN_INCLUDE_HEADERS
-    memory_chunk.h
     novel_types.h
-    stl_lite.h
 )
 
 install(
diff --git a/src/lookup/CMakeLists.txt b/src/lookup/CMakeLists.txt
index bd29b4a..a0ea31d 100644
--- a/src/lookup/CMakeLists.txt
+++ b/src/lookup/CMakeLists.txt
@@ -3,14 +3,6 @@ set(
 )
 
 set(
-    LIBLOOKUP_HEADERS
-    lookup.h
-    pinyin_lookup.h
-    phrase_lookup.h
-    winner_tree.h
-)
-
-set(
     LIBLOOKUP_SOURCES
     pinyin_lookup.cpp
     winner_tree.cpp
diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
index 59f6bfd..4988c1b 100644
--- a/src/storage/CMakeLists.txt
+++ b/src/storage/CMakeLists.txt
@@ -4,16 +4,10 @@ set(
 
 set(
     LIBSTORAGE_HEADERS
-    pinyin_large_table.h
+    pinyin_custom.h
     pinyin_base.h
-    pinyin_phrase.h
-    phrase_index.h
-    phrase_index_logger.h
-    pinyin_zhuyin_map_data.h
-    phrase_large_table.h
-    ngram.h
-    flexible_ngram.h
-    tag_utility.h
+    chewing_key.h
+    pinyin_custom2.h
 )
 
 set(
@@ -24,6 +18,8 @@ set(
     phrase_large_table.cpp
     ngram.cpp
     tag_utility.cpp
+    pinyin_parser2.cpp
+    chewing_large_table.cpp
 )
 
 add_library(
diff --git a/tests/storage/CMakeLists.txt b/tests/storage/CMakeLists.txt
index 2f50a28..bff5108 100644
--- a/tests/storage/CMakeLists.txt
+++ b/tests/storage/CMakeLists.txt
@@ -11,6 +11,16 @@ target_link_libraries(
 )
 
 add_executable(
+    test_parser2
+    test_parser2.cpp
+)
+
+target_link_libraries(
+    test_parser2
+    libpinyin
+)
+
+add_executable(
     test_pinyin_index
     test_pinyin_index.cpp
 )
@@ -31,6 +41,16 @@ target_link_libraries(
 )
 
 add_executable(
+    test_phrase_index_logger
+    test_phrase_index_logger.cpp
+)
+
+target_link_libraries(
+    test_phrase_index_logger
+    libpinyin
+)
+
+add_executable(
     test_phrase_table
     test_phrase_table.cpp
 )
diff --git a/utils/storage/CMakeLists.txt b/utils/storage/CMakeLists.txt
index 551a457..ddf8855 100644
--- a/utils/storage/CMakeLists.txt
+++ b/utils/storage/CMakeLists.txt
@@ -1,4 +1,14 @@
 add_executable(
+    gen_zhuyin_map
+    gen_zhuyin_map.cpp
+)
+
+target_link_libraries(
+    gen_zhuyin_map
+    libpinyin
+)
+
+add_executable(
     gen_pinyin_table
     gen_pinyin_table.cpp
 )
@@ -36,4 +46,4 @@ add_executable(
 target_link_libraries(
     export_interpolation
     libpinyin
-)
\ No newline at end of file
+)