Kouhei Sutou
null+****@clear*****
Tue Oct 24 18:10:39 JST 2017
Kouhei Sutou 2017-10-24 18:10:39 +0900 (Tue, 24 Oct 2017) New Revision: b71df5642871b6ae3fd6c9d649fb30063f5c4be0 https://github.com/groonga/groonga/commit/b71df5642871b6ae3fd6c9d649fb30063f5c4be0 Message: cmake: enable PDB related configuration only for MSVC Modified files: lib/CMakeLists.txt plugins/functions/CMakeLists.txt plugins/query_expanders/CMakeLists.txt plugins/suggest/CMakeLists.txt plugins/token_filters/CMakeLists.txt plugins/tokenizers/CMakeLists.txt src/CMakeLists.txt src/suggest/CMakeLists.txt tools/travis-before-script.sh vendor/lz4/CMakeLists.txt vendor/mecab/CMakeLists.txt vendor/message_pack/CMakeLists.txt Modified: lib/CMakeLists.txt (+1 -1) =================================================================== --- lib/CMakeLists.txt 2017-10-24 17:57:33 +0900 (9fa29e9af) +++ lib/CMakeLists.txt 2017-10-24 18:10:39 +0900 (8a219318d) @@ -119,7 +119,7 @@ else() ARCHIVE DESTINATION "${LIB_DIR}" LIBRARY DESTINATION "${LIB_DIR}" RUNTIME DESTINATION "${BIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:libgroonga> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: plugins/functions/CMakeLists.txt (+2 -2) =================================================================== --- plugins/functions/CMakeLists.txt 2017-10-24 17:57:33 +0900 (8971ce4fa) +++ plugins/functions/CMakeLists.txt 2017-10-24 18:10:39 +0900 (f878126bc) @@ -36,7 +36,7 @@ else() PREFIX "" OUTPUT_NAME "vector") install(TARGETS vector_functions DESTINATION "${GRN_FUNCTIONS_PLUGIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:vector_functions> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -61,7 +61,7 @@ else() PREFIX "" OUTPUT_NAME "string") install(TARGETS string_functions DESTINATION "${GRN_FUNCTIONS_PLUGIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:string_functions> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: plugins/query_expanders/CMakeLists.txt (+1 -1) =================================================================== --- plugins/query_expanders/CMakeLists.txt 2017-10-24 17:57:33 +0900 (a59abfb8f) +++ plugins/query_expanders/CMakeLists.txt 2017-10-24 18:10:39 +0900 (b90df5a45) @@ -34,7 +34,7 @@ else() PREFIX "" OUTPUT_NAME "tsv") install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:tsv_query_expander> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: plugins/suggest/CMakeLists.txt (+1 -1) =================================================================== --- plugins/suggest/CMakeLists.txt 2017-10-24 17:57:33 +0900 (df17ef805) +++ plugins/suggest/CMakeLists.txt 2017-10-24 18:10:39 +0900 (2abfaf2ee) @@ -32,7 +32,7 @@ else() add_library(suggest MODULE ${SUGGEST_SOURCES}) set_target_properties(suggest PROPERTIES PREFIX "") install(TARGETS suggest DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/suggest") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:suggest> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: plugins/token_filters/CMakeLists.txt (+2 -2) =================================================================== --- plugins/token_filters/CMakeLists.txt 2017-10-24 17:57:33 +0900 (aa9693b3b) +++ plugins/token_filters/CMakeLists.txt 2017-10-24 18:10:39 +0900 (da75572e7) @@ -36,7 +36,7 @@ else() PREFIX "" OUTPUT_NAME "stop_word") install(TARGETS stop_word_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:stop_word_token_filter> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -63,7 +63,7 @@ if(GRN_WITH_LIBSTEMMER) PREFIX "" OUTPUT_NAME "stem") install(TARGETS stem_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:stem_token_filter> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: plugins/tokenizers/CMakeLists.txt (+2 -2) =================================================================== --- plugins/tokenizers/CMakeLists.txt 2017-10-24 17:57:33 +0900 (ec9c9a28e) +++ plugins/tokenizers/CMakeLists.txt 2017-10-24 18:10:39 +0900 (0d4c7609e) @@ -48,7 +48,7 @@ if(GRN_WITH_MECAB) PREFIX "" OUTPUT_NAME "mecab") install(TARGETS mecab_tokenizer DESTINATION "${TOKENIZERS_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:mecab_tokenizer> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -76,7 +76,7 @@ if(GRN_WITH_KYTEA) PREFIX "" OUTPUT_NAME "kytea") install(TARGETS kytea_tokenizer DESTINATION "${TOKENIZERS_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:kytea_tokenizer> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: src/CMakeLists.txt (+3 -3) =================================================================== --- src/CMakeLists.txt 2017-10-24 17:57:33 +0900 (64314cdd5) +++ src/CMakeLists.txt 2017-10-24 18:10:39 +0900 (acead668e) @@ -27,7 +27,7 @@ set_source_files_properties(${GROONGA_SOURCES} COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga libgroonga) install(TARGETS groonga DESTINATION ${BIN_DIR}) -if(CMAKE_VERSION VERSION_GREATER "3.1") +if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:groonga> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -44,7 +44,7 @@ if(GRN_WITH_MRUBY) COMPILE_DEFINITIONS "${MRUBY_DEFINITIONS}") target_link_libraries(grndb libgroonga) install(TARGETS grndb DESTINATION ${BIN_DIR}) - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:grndb> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -69,7 +69,7 @@ set_source_files_properties(${GROONGA_BENCHMARK_SOURCES} COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga-benchmark libgroonga) install(TARGETS groonga-benchmark DESTINATION ${BIN_DIR}) -if(CMAKE_VERSION VERSION_GREATER "3.1") +if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:groonga-benchmark> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: src/suggest/CMakeLists.txt (+2 -2) =================================================================== --- src/suggest/CMakeLists.txt 2017-10-24 17:57:33 +0900 (be39a6cab) +++ src/suggest/CMakeLists.txt 2017-10-24 18:10:39 +0900 (c9210efaa) @@ -29,7 +29,7 @@ target_link_libraries(groonga-suggest-create-dataset libgroonga) install( TARGETS groonga-suggest-create-dataset DESTINATION ${BIN_DIR}) -if(CMAKE_VERSION VERSION_GREATER "3.1") +if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:groonga-suggest-create-dataset> DESTINATION "${PDB_DIR}" OPTIONAL) @@ -89,7 +89,7 @@ if(GRN_WITH_SUGGEST_LEARNER) install( TARGETS groonga-suggest-learner groonga-suggest-httpd DESTINATION ${BIN_DIR}) - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install( FILES $<TARGET_PDB_FILE:groonga-suggest-learner> Modified: tools/travis-before-script.sh (+0 -1) =================================================================== --- tools/travis-before-script.sh 2017-10-24 17:57:33 +0900 (d53022663) +++ tools/travis-before-script.sh 2017-10-24 18:10:39 +0900 (87ed5756a) @@ -28,7 +28,6 @@ case "${BUILD_TOOL}" in ./configure --prefix=${prefix} --with-ruby ${configure_args} ;; cmake) - cmake --version cmake_args="" cmake_args="${cmake_args} -DGRN_WITH_DEBUG=yes" if [ "${ENABLE_MRUBY}" = "yes" ]; then Modified: vendor/lz4/CMakeLists.txt (+1 -1) =================================================================== --- vendor/lz4/CMakeLists.txt 2017-10-24 17:57:33 +0900 (d77f10c90) +++ vendor/lz4/CMakeLists.txt 2017-10-24 18:10:39 +0900 (8de3d8a71) @@ -83,7 +83,7 @@ if(GRN_WITH_BUNDLED_LZ4) RUNTIME DESTINATION "${BIN_DIR}") install(TARGETS lz4 DESTINATION "${BIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:lz4> DESTINATION "${PDB_DIR}" OPTIONAL) Modified: vendor/mecab/CMakeLists.txt (+1 -1) =================================================================== --- vendor/mecab/CMakeLists.txt 2017-10-24 17:57:33 +0900 (708d9cb8f) +++ vendor/mecab/CMakeLists.txt 2017-10-24 18:10:39 +0900 (760102aa8) @@ -173,7 +173,7 @@ if(GRN_WITH_BUNDLED_MECAB) DESTINATION "${BIN_DIR}") install(TARGETS mecab-dict-index DESTINATION "${BIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install( FILES $<TARGET_PDB_FILE:libmecab> Modified: vendor/message_pack/CMakeLists.txt (+1 -1) =================================================================== --- vendor/message_pack/CMakeLists.txt 2017-10-24 17:57:33 +0900 (3efc2498d) +++ vendor/message_pack/CMakeLists.txt 2017-10-24 18:10:39 +0900 (431fa91a4) @@ -41,7 +41,7 @@ if(GRN_WITH_BUNDLED_MESSAGE_PACK) ARCHIVE DESTINATION "${LIB_DIR}" LIBRARY DESTINATION "${LIB_DIR}" RUNTIME DESTINATION "${BIN_DIR}") - if(CMAKE_VERSION VERSION_GREATER "3.1") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "3.1") install(FILES $<TARGET_PDB_FILE:msgpackc> DESTINATION "${PDB_DIR}" OPTIONAL) -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171024/51509143/attachment-0001.htm
