susumu.yata
null+****@clear*****
Thu Jan 29 16:44:59 JST 2015
susumu.yata 2015-01-29 16:44:59 +0900 (Thu, 29 Jan 2015) New Revision: 7974b44f4e238a5d64a5a7cdef899df8f779a023 https://github.com/groonga/groonga/commit/7974b44f4e238a5d64a5a7cdef899df8f779a023 Message: cmake: don't install additional modules if bundled with MariaDB Patch by Kentoku Shiba. Thanks!!! Modified files: CMakeLists.txt data/CMakeLists.txt data/html/CMakeLists.txt include/CMakeLists.txt lib/CMakeLists.txt plugins/query_expanders/CMakeLists.txt plugins/ruby/CMakeLists.txt plugins/suggest/CMakeLists.txt plugins/table/CMakeLists.txt plugins/tokenizers/CMakeLists.txt src/CMakeLists.txt src/suggest/CMakeLists.txt Modified: CMakeLists.txt (+16 -3) =================================================================== --- CMakeLists.txt 2015-01-29 00:09:38 +0900 (567c579) +++ CMakeLists.txt 2015-01-29 16:44:59 +0900 (62fd1f1) @@ -150,6 +150,9 @@ if(CMAKE_COMPILER_IS_GNUCXX) check_cxxflag("-fexceptions") check_cxxflag("-fimplicit-templates") check_build_flag("-Wno-clobbered") + if(MRN_GROONGA_BUNDLED) + check_build_flag("-fPIC") + endif() endif() option(GRN_WITH_DEBUG "enable debug build." OFF) @@ -224,6 +227,14 @@ ac_check_lib(rt clock_gettime) if(HAVE_LIBRT) set(HAVE_CLOCK_GETTIME TRUE) endif() +if(MRN_GROONGA_BUNDLED) + ac_check_lib(m sincos) + check_library_exists(stdc++ __cxa_begin_catch "${ARG2}" + STDCPP) + if(STDCPP) + set(STDCPP_LIBS "stdc++") + endif() +endif() if(UNIX) ac_check_headers(pthread.h) @@ -520,8 +531,10 @@ set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}") set(EXEEXT "${CMAKE_EXECUTABLE_SUFFIX}") configure_file(groonga.pc.in "${CMAKE_CURRENT_BINARY_DIR}/groonga.pc" @ONLY) -install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/groonga.pc" - DESTINATION "${LIB_DIR}/pkgconfig/") +if(NOT MRN_GROONGA_BUNDLED) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/groonga.pc" + DESTINATION "${LIB_DIR}/pkgconfig/") +endif() add_subdirectory(vendor/plugins) Modified: data/CMakeLists.txt (+3 -1) =================================================================== --- data/CMakeLists.txt 2015-01-29 00:09:38 +0900 (7f766ef) +++ data/CMakeLists.txt 2015-01-29 16:44:59 +0900 (003445a) @@ -15,4 +15,6 @@ add_subdirectory(html) -install(FILES groonga.conf DESTINATION "${GRN_CONFIG_DIR}/") +if(NOT MRN_GROONGA_BUNDLED) + install(FILES groonga.conf DESTINATION "${GRN_CONFIG_DIR}/") +endif() Modified: data/html/CMakeLists.txt (+3 -1) =================================================================== --- data/html/CMakeLists.txt 2015-01-29 00:09:38 +0900 (b6ccf55) +++ data/html/CMakeLists.txt 2015-01-29 16:44:59 +0900 (1c96d89) @@ -13,4 +13,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -install(DIRECTORY admin DESTINATION "${GRN_DATA_DIR}/html") +if(NOT MRN_GROONGA_BUNDLED) + install(DIRECTORY admin DESTINATION "${GRN_DATA_DIR}/html") +endif() Modified: include/CMakeLists.txt (+5 -3) =================================================================== --- include/CMakeLists.txt 2015-01-29 00:09:38 +0900 (7594c6e) +++ include/CMakeLists.txt 2015-01-29 16:44:59 +0900 (96e2247) @@ -13,6 +13,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -install(FILES groonga.h DESTINATION "${GRN_INCLUDE_DIR}") -install(DIRECTORY groonga DESTINATION "${GRN_INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.h") +if(NOT MRN_GROONGA_BUNDLED) + install(FILES groonga.h DESTINATION "${GRN_INCLUDE_DIR}") + install(DIRECTORY groonga DESTINATION "${GRN_INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h") +endif() Modified: lib/CMakeLists.txt (+43 -18) =================================================================== --- lib/CMakeLists.txt 2015-01-29 00:09:38 +0900 (1ee31fa) +++ lib/CMakeLists.txt 2015-01-29 16:44:59 +0900 (2177440) @@ -39,31 +39,56 @@ set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS}") -add_library(libgroonga SHARED - ${LIBGROONGA_SOURCES} - ${LIBGRNDAT_SOURCES} - ${LIBGRNMRB_SOURCES} - ${MRUBY_LIBS}) +if(MRN_GROONGA_BUNDLED) + add_library(libgroonga STATIC + ${LIBGROONGA_SOURCES} + ${LIBGRNDAT_SOURCES} + ${LIBGRNMRB_SOURCES} + ${MRUBY_LIBS}) +else() + add_library(libgroonga SHARED + ${LIBGROONGA_SOURCES} + ${LIBGRNDAT_SOURCES} + ${LIBGRNMRB_SOURCES} + ${MRUBY_LIBS}) +endif() set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga") -target_link_libraries(libgroonga - ${EXECINFO_LIBS} - ${RT_LIBS} - ${PTHREAD_LIBS} - ${Z_LIBS} - ${LIBLZ4_LIBRARIES} - ${DL_LIBS} - ${WS2_32_LIBS}) - -install(TARGETS libgroonga - ARCHIVE DESTINATION "${LIB_DIR}" - LIBRARY DESTINATION "${LIB_DIR}" - RUNTIME DESTINATION "${BIN_DIR}") +if(NOT MRN_GROONGA_BUNDLED) + target_link_libraries(libgroonga + ${EXECINFO_LIBS} + ${RT_LIBS} + ${PTHREAD_LIBS} + ${Z_LIBS} + ${LIBLZ4_LIBRARIES} + ${DL_LIBS} + ${WS2_32_LIBS}) + install(TARGETS libgroonga + ARCHIVE DESTINATION "${LIB_DIR}" + LIBRARY DESTINATION "${LIB_DIR}" + RUNTIME DESTINATION "${BIN_DIR}") +else() + target_link_libraries(libgroonga + ${EXECINFO_LIBS} + ${RT_LIBS} + ${PTHREAD_LIBS} + ${Z_LIBS} + ${LIBLZ4_LIBRARIES} + ${DL_LIBS} + ${M_LIBS} + ${STDCPP_LIBS} + ${WS2_32_LIBS}) +endif() if(GRN_WITH_MRUBY) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mrb/scripts/sources.am RUBY_SCRIPTS) string(REGEX REPLACE "([^;]+)" "mrb/scripts/\\1" RUBY_SCRIPTS "${RUBY_SCRIPTS}") + if(NOT MRN_GROONGA_BUNDLED) + install( + FILES ${RUBY_SCRIPTS} + DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}") + endif() install( FILES ${RUBY_SCRIPTS} DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}") Modified: plugins/query_expanders/CMakeLists.txt (+3 -1) =================================================================== --- plugins/query_expanders/CMakeLists.txt 2015-01-29 00:09:38 +0900 (57d11ab) +++ plugins/query_expanders/CMakeLists.txt 2015-01-29 16:44:59 +0900 (1e2a2c2) @@ -27,4 +27,6 @@ set_target_properties(tsv_query_expander PROPERTIES PREFIX "" OUTPUT_NAME "tsv") target_link_libraries(tsv_query_expander libgroonga) -install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") +endif() Modified: plugins/ruby/CMakeLists.txt (+6 -2) =================================================================== --- plugins/ruby/CMakeLists.txt 2015-01-29 00:09:38 +0900 (ba7deaf) +++ plugins/ruby/CMakeLists.txt 2015-01-29 16:44:59 +0900 (d82b154) @@ -27,7 +27,9 @@ if(GRN_WITH_MRUBY) COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(eval PROPERTIES PREFIX "") target_link_libraries(eval libgroonga) - install(TARGETS eval DESTINATION "${GRN_RELATIVE_RUBY_PLUGINS_DIR}") + if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS eval DESTINATION "${GRN_RELATIVE_RUBY_PLUGINS_DIR}") + endif() read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/load_sources.am RUBY_LOAD_SOURCES) add_library(load MODULE ${RUBY_LOAD_SOURCES}) @@ -36,5 +38,7 @@ if(GRN_WITH_MRUBY) COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(load PROPERTIES PREFIX "") target_link_libraries(load libgroonga) - install(TARGETS load DESTINATION "${GRN_RELATIVE_RUBY_PLUGINS_DIR}") + if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS load DESTINATION "${GRN_RELATIVE_RUBY_PLUGINS_DIR}") + endif() endif() Modified: plugins/suggest/CMakeLists.txt (+3 -1) =================================================================== --- plugins/suggest/CMakeLists.txt 2015-01-29 00:09:38 +0900 (5191939) +++ plugins/suggest/CMakeLists.txt 2015-01-29 16:44:59 +0900 (72b8636) @@ -24,4 +24,6 @@ set_source_files_properties(${SUGGEST_SOURCES} COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(suggest PROPERTIES PREFIX "") target_link_libraries(suggest libgroonga) -install(TARGETS suggest DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/suggest") +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS suggest DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/suggest") +endif() Modified: plugins/table/CMakeLists.txt (+3 -1) =================================================================== --- plugins/table/CMakeLists.txt 2015-01-29 00:09:38 +0900 (eada039) +++ plugins/table/CMakeLists.txt 2015-01-29 16:44:59 +0900 (cba4697) @@ -24,4 +24,6 @@ set_source_files_properties(${TABLE_SOURCES} COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(table PROPERTIES PREFIX "") target_link_libraries(table libgroonga) -install(TARGETS table DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/table") +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS table DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/table") +endif() Modified: plugins/tokenizers/CMakeLists.txt (+6 -2) =================================================================== --- plugins/tokenizers/CMakeLists.txt 2015-01-29 00:09:38 +0900 (5871e98) +++ plugins/tokenizers/CMakeLists.txt 2015-01-29 16:44:59 +0900 (e044c1f) @@ -30,7 +30,9 @@ if(GRN_WITH_MECAB) PREFIX "" OUTPUT_NAME "mecab") target_link_libraries(mecab_tokenizer libgroonga ${MECAB_LIBRARIES}) - install(TARGETS mecab_tokenizer DESTINATION "${TOKENIZERS_DIR}") + if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS mecab_tokenizer DESTINATION "${TOKENIZERS_DIR}") + endif() endif() if(GRN_WITH_KYTEA) @@ -45,5 +47,7 @@ if(GRN_WITH_KYTEA) PREFIX "" OUTPUT_NAME "kytea") target_link_libraries(kytea_tokenizer libgroonga ${KYTEA_LIBRARIES}) - install(TARGETS kytea_tokenizer DESTINATION "${TOKENIZERS_DIR}") + if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS kytea_tokenizer DESTINATION "${TOKENIZERS_DIR}") + endif() endif() Modified: src/CMakeLists.txt (+9 -3) =================================================================== --- src/CMakeLists.txt 2015-01-29 00:09:38 +0900 (258d186) +++ src/CMakeLists.txt 2015-01-29 16:44:59 +0900 (4d02109) @@ -25,7 +25,9 @@ set_source_files_properties(${GROONGA_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga libgroonga) -install(TARGETS groonga DESTINATION ${BIN_DIR}) +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS groonga DESTINATION ${BIN_DIR}) +endif() if(NOT WIN32) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/grnslap_sources.am GRNSLAP_SOURCES) @@ -34,7 +36,9 @@ if(NOT WIN32) PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(grnslap libgroonga) - install(TARGETS grnslap DESTINATION ${BIN_DIR}) + if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS grnslap DESTINATION ${BIN_DIR}) + endif() endif() read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_benchmark_sources.am @@ -44,5 +48,7 @@ set_source_files_properties(${GROONGA_BENCHMARK_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga-benchmark libgroonga) -install(TARGETS groonga-benchmark DESTINATION ${BIN_DIR}) +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS groonga-benchmark DESTINATION ${BIN_DIR}) +endif() Modified: src/suggest/CMakeLists.txt (+10 -6) =================================================================== --- src/suggest/CMakeLists.txt 2015-01-29 00:09:38 +0900 (c0c7a9c) +++ src/suggest/CMakeLists.txt 2015-01-29 16:44:59 +0900 (0773026) @@ -25,9 +25,11 @@ set_source_files_properties(${GROONGA_SUGGEST_CREATE_DATASET_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga-suggest-create-dataset libgroonga) -install( - TARGETS groonga-suggest-create-dataset - DESTINATION ${BIN_DIR}) +if(NOT MRN_GROONGA_BUNDLED) + install( + TARGETS groonga-suggest-create-dataset + DESTINATION ${BIN_DIR}) +endif() if(GRN_WITH_LIBEVENT AND GRN_WITH_ZEROMQ AND GRN_WITH_MESSAGE_PACK) set(GRN_WITH_SUGGEST_LEARNER TRUE) @@ -80,7 +82,9 @@ if(GRN_WITH_SUGGEST_LEARNER) ${ZEROMQ_LIBRARIES} ${MESSAGE_PACK_LIBRARIES}) - install( - TARGETS groonga-suggest-learner groonga-suggest-httpd - DESTINATION ${BIN_DIR}) + if(NOT MRN_GROONGA_BUNDLED) + install( + TARGETS groonga-suggest-learner groonga-suggest-httpd + DESTINATION ${BIN_DIR}) + endif() endif() -------------- next part -------------- HTML����������������������������...下载
