Kouhei Sutou
null+****@clear*****
Thu Apr 16 15:46:39 JST 2015
Kouhei Sutou 2015-04-16 15:46:39 +0900 (Thu, 16 Apr 2015) New Revision: 17191a7031eec4d87dc29d17ee6d1aeb0c2c591c https://github.com/groonga/groonga/commit/17191a7031eec4d87dc29d17ee6d1aeb0c2c591c Message: cmake: support building functions/vector plugin Modified files: plugins/CMakeLists.txt plugins/functions/CMakeLists.txt Modified: plugins/CMakeLists.txt (+1 -0) =================================================================== --- plugins/CMakeLists.txt 2015-04-16 15:31:10 +0900 (89a28f5) +++ plugins/CMakeLists.txt 2015-04-16 15:46:39 +0900 (37f6127) @@ -20,6 +20,7 @@ add_subdirectory(query_expanders) add_subdirectory(ruby) add_subdirectory(token_filters) add_subdirectory(sharding) +add_subdirectory(functions) if(GRN_WITH_MRUBY) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/ruby_scripts.am RUBY_SCRIPTS) Modified: plugins/functions/CMakeLists.txt (+8 -23) =================================================================== --- plugins/functions/CMakeLists.txt 2015-04-16 15:31:10 +0900 (c69a89a) +++ plugins/functions/CMakeLists.txt 2015-04-16 15:46:39 +0900 (28db8b4) @@ -19,29 +19,14 @@ include_directories( set(GRN_FUNCTIONS_PLUGIN_DIR "${GRN_RELATIVE_PLUGINS_DIR}/functions") -read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/stop_word_sources.am - STOP_WORD_SOURCES) -add_library(stop_word_token_filter MODULE ${STOP_WORD_SOURCES}) -set_source_files_properties(${STOP_WORD_SOURCES} +read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/vector_sources.am + VECTOR_SOURCES) +add_library(vector_functions MODULE ${VECTOR_SOURCES}) +set_source_files_properties(${VECTOR_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") -set_target_properties(stop_word_token_filter PROPERTIES +set_target_properties(vector_functions PROPERTIES PREFIX "" - OUTPUT_NAME "stop_word") -target_link_libraries(stop_word_token_filter libgroonga) -install(TARGETS stop_word_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") - -if(GRN_WITH_LIBSTEMMER) - read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/stem_sources.am STEM_SOURCES) - include_directories(${LIBSTEMMER_INCLUDE_DIRS}) - link_directories(${LIBSTEMMER_LIBRARY_DIRS}) - add_library(stem_token_filter MODULE ${STEM_SOURCES}) - set_source_files_properties(${STEM_SOURCES} - PROPERTIES - COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") - set_target_properties(stem_token_filter PROPERTIES - PREFIX "" - OUTPUT_NAME "stem") - target_link_libraries(stem_token_filter libgroonga ${LIBSTEMMER_LIBRARIES}) - install(TARGETS stem_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") -endif() + OUTPUT_NAME "vector") +target_link_libraries(vector_functions libgroonga) +install(TARGETS vector_functions DESTINATION "${GRN_FUNCTIONS_PLUGIN_DIR}") -------------- next part -------------- HTML����������������������������...다운로드
