From d4a34f42b9e7c877e7d268b0d2a3b336da5e138c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 31 Aug 2017 15:41:53 +0800 Subject: update cmake files --- CMakeLists.txt | 6 +++--- src/CMakeLists.txt | 14 +++++++------- src/lookup/CMakeLists.txt | 1 + tests/CMakeLists.txt | 6 +++--- tests/include/CMakeLists.txt | 4 ++-- tests/lookup/CMakeLists.txt | 4 ++-- tests/storage/CMakeLists.txt | 14 +++++++------- utils/segment/CMakeLists.txt | 6 +++--- utils/storage/CMakeLists.txt | 6 +++--- utils/training/CMakeLists.txt | 28 ++++++++++++++-------------- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be6dc11..1174af8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ enable_testing() ######## Package information set (PACKAGE_URL https://github.com/libpinyin/libpinyin) set (PACKAGE_BUGREPORT https://github.com/libpinyin/libpinyin/issues) -set (LIBPINYIN_VERSION_MAJOR 0) -set (LIBPINYIN_VERSION_MINOR 7) +set (LIBPINYIN_VERSION_MAJOR 2) +set (LIBPINYIN_VERSION_MINOR 1) set (LIBPINYIN_VERSION_REVISION 0) -set (LIBPINYIN_BINARY_VERSION 2.0) +set (LIBPINYIN_BINARY_VERSION 13.0) if (CMAKE_BUILD_TYPE MATCHES Debug) set (version_suffix .Debug) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 070218d..fe16a66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,31 +9,31 @@ set( ) add_library( - libpinyin + pinyin SHARED ${LIBPINYIN_SOURCES} ) target_link_libraries( - libpinyin + pinyin storage lookup ) set_target_properties( - libpinyin + pinyin PROPERTIES OUTPUT_NAME - libpinyin + pinyin VERSION - 10.0.0 + 13.0.0 SOVERSION - 10 + 13 ) install( TARGETS - libpinyin + pinyin LIBRARY DESTINATION ${DIR_LIBRARY} ) diff --git a/src/lookup/CMakeLists.txt b/src/lookup/CMakeLists.txt index 937b2cb..767748c 100644 --- a/src/lookup/CMakeLists.txt +++ b/src/lookup/CMakeLists.txt @@ -5,6 +5,7 @@ set( set( LIBLOOKUP_SOURCES pinyin_lookup2.cpp + phonetic_lookup.cpp phrase_lookup.cpp lookup.cpp ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5783407..4dfaed1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable( target_link_libraries( test_pinyin - libpinyin + pinyin ) add_executable( @@ -19,7 +19,7 @@ add_executable( target_link_libraries( test_phrase - libpinyin + pinyin ) add_executable( @@ -29,5 +29,5 @@ add_executable( target_link_libraries( test_chewing - libpinyin + pinyin ) diff --git a/tests/include/CMakeLists.txt b/tests/include/CMakeLists.txt index f51c87e..3ad956c 100644 --- a/tests/include/CMakeLists.txt +++ b/tests/include/CMakeLists.txt @@ -5,5 +5,5 @@ add_executable( target_link_libraries( test_memory_chunk - libpinyin -) \ No newline at end of file + pinyin +) diff --git a/tests/lookup/CMakeLists.txt b/tests/lookup/CMakeLists.txt index 3304c47..38d45de 100644 --- a/tests/lookup/CMakeLists.txt +++ b/tests/lookup/CMakeLists.txt @@ -7,7 +7,7 @@ add_executable( target_link_libraries( test_pinyin_lookup - libpinyin + pinyin ) add_executable( @@ -17,5 +17,5 @@ add_executable( target_link_libraries( test_phrase_lookup - libpinyin + pinyin ) diff --git a/tests/storage/CMakeLists.txt b/tests/storage/CMakeLists.txt index 96b12fc..378e134 100644 --- a/tests/storage/CMakeLists.txt +++ b/tests/storage/CMakeLists.txt @@ -7,7 +7,7 @@ add_executable( target_link_libraries( test_parser2 - libpinyin + pinyin ) add_executable( @@ -17,7 +17,7 @@ add_executable( target_link_libraries( test_chewing_table - libpinyin + pinyin ) add_executable( @@ -27,7 +27,7 @@ add_executable( target_link_libraries( test_phrase_index - libpinyin + pinyin ) add_executable( @@ -37,7 +37,7 @@ add_executable( target_link_libraries( test_phrase_index_logger - libpinyin + pinyin ) add_executable( @@ -47,7 +47,7 @@ add_executable( target_link_libraries( test_phrase_table - libpinyin + pinyin ) add_executable( @@ -57,7 +57,7 @@ add_executable( target_link_libraries( test_ngram - libpinyin + pinyin ) add_executable( @@ -67,5 +67,5 @@ add_executable( target_link_libraries( test_flexible_ngram - libpinyin + pinyin ) diff --git a/utils/segment/CMakeLists.txt b/utils/segment/CMakeLists.txt index 82e4deb..c0f0a9a 100644 --- a/utils/segment/CMakeLists.txt +++ b/utils/segment/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable( target_link_libraries( spseg - libpinyin + pinyin ) add_executable( @@ -15,5 +15,5 @@ add_executable( target_link_libraries( ngseg - libpinyin -) \ No newline at end of file + pinyin +) diff --git a/utils/storage/CMakeLists.txt b/utils/storage/CMakeLists.txt index 63cabcd..648f430 100644 --- a/utils/storage/CMakeLists.txt +++ b/utils/storage/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable( target_link_libraries( gen_binary_files - libpinyin + pinyin ) add_executable( @@ -15,7 +15,7 @@ add_executable( target_link_libraries( import_interpolation - libpinyin + pinyin ) add_executable( @@ -25,5 +25,5 @@ add_executable( target_link_libraries( export_interpolation - libpinyin + pinyin ) diff --git a/utils/training/CMakeLists.txt b/utils/training/CMakeLists.txt index ee59bcd..27620fb 100644 --- a/utils/training/CMakeLists.txt +++ b/utils/training/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable( target_link_libraries( gen_ngram - libpinyin + pinyin ) add_executable( @@ -15,7 +15,7 @@ add_executable( target_link_libraries( gen_deleted_ngram - libpinyin + pinyin ) add_executable( @@ -25,7 +25,7 @@ add_executable( target_link_libraries( gen_unigram - libpinyin + pinyin ) add_executable( @@ -35,7 +35,7 @@ add_executable( target_link_libraries( gen_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -45,7 +45,7 @@ add_executable( target_link_libraries( estimate_interpolation - libpinyin + pinyin ) add_executable( @@ -55,7 +55,7 @@ add_executable( target_link_libraries( estimate_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -65,7 +65,7 @@ add_executable( target_link_libraries( merge_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -75,7 +75,7 @@ add_executable( target_link_libraries( prune_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -85,7 +85,7 @@ add_executable( target_link_libraries( import_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -95,7 +95,7 @@ add_executable( target_link_libraries( export_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -105,7 +105,7 @@ add_executable( target_link_libraries( k_mixture_model_to_interpolation - libpinyin + pinyin ) add_executable( @@ -115,7 +115,7 @@ add_executable( target_link_libraries( validate_k_mixture_model - libpinyin + pinyin ) add_executable( @@ -125,5 +125,5 @@ add_executable( target_link_libraries( eval_correction_rate - libpinyin -) \ No newline at end of file + pinyin +) -- cgit