Kouhei Sutou
null+****@clear*****
Tue Oct 24 16:51:03 JST 2017
Kouhei Sutou 2017-10-24 16:51:03 +0900 (Tue, 24 Oct 2017) New Revision: 8eb050472ac20450a3e996c7ef1e20a690cebd73 https://github.com/groonga/groonga/commit/8eb050472ac20450a3e996c7ef1e20a690cebd73 Message: cmake: TARGET_PDB_FILE is available since CMake 3.2 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 vendor/lz4/CMakeLists.txt vendor/mecab/CMakeLists.txt vendor/message_pack/CMakeLists.txt Modified: lib/CMakeLists.txt (+5 -3) =================================================================== --- lib/CMakeLists.txt 2017-10-13 12:40:54 +0900 (66f8ce896) +++ lib/CMakeLists.txt 2017-10-24 16:51:03 +0900 (9fa29e9af) @@ -119,9 +119,11 @@ else() ARCHIVE DESTINATION "${LIB_DIR}" LIBRARY DESTINATION "${LIB_DIR}" RUNTIME DESTINATION "${BIN_DIR}") - install(FILES $<TARGET_PDB_FILE:libgroonga> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:libgroonga> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() if(GRN_WITH_MRUBY) Modified: plugins/functions/CMakeLists.txt (+10 -6) =================================================================== --- plugins/functions/CMakeLists.txt 2017-10-13 12:40:54 +0900 (480a23db6) +++ plugins/functions/CMakeLists.txt 2017-10-24 16:51:03 +0900 (8971ce4fa) @@ -36,9 +36,11 @@ else() PREFIX "" OUTPUT_NAME "vector") install(TARGETS vector_functions DESTINATION "${GRN_FUNCTIONS_PLUGIN_DIR}") - install(FILES $<TARGET_PDB_FILE:vector_functions> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:vector_functions> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(vector_functions libgroonga) @@ -59,9 +61,11 @@ else() PREFIX "" OUTPUT_NAME "string") install(TARGETS string_functions DESTINATION "${GRN_FUNCTIONS_PLUGIN_DIR}") - install(FILES $<TARGET_PDB_FILE:string_functions> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:string_functions> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(string_functions libgroonga) Modified: plugins/query_expanders/CMakeLists.txt (+5 -3) =================================================================== --- plugins/query_expanders/CMakeLists.txt 2017-10-13 12:40:54 +0900 (720781d3b) +++ plugins/query_expanders/CMakeLists.txt 2017-10-24 16:51:03 +0900 (a59abfb8f) @@ -34,8 +34,10 @@ else() PREFIX "" OUTPUT_NAME "tsv") install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") - install(FILES $<TARGET_PDB_FILE:tsv_query_expander> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:tsv_query_expander> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(tsv_query_expander libgroonga) Modified: plugins/suggest/CMakeLists.txt (+5 -3) =================================================================== --- plugins/suggest/CMakeLists.txt 2017-10-13 12:40:54 +0900 (37baada2d) +++ plugins/suggest/CMakeLists.txt 2017-10-24 16:51:03 +0900 (df17ef805) @@ -32,8 +32,10 @@ else() add_library(suggest MODULE ${SUGGEST_SOURCES}) set_target_properties(suggest PROPERTIES PREFIX "") install(TARGETS suggest DESTINATION "${GRN_RELATIVE_PLUGINS_DIR}/suggest") - install(FILES $<TARGET_PDB_FILE:suggest> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:suggest> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(suggest libgroonga) Modified: plugins/token_filters/CMakeLists.txt (+10 -6) =================================================================== --- plugins/token_filters/CMakeLists.txt 2017-10-13 12:40:54 +0900 (3889cad6f) +++ plugins/token_filters/CMakeLists.txt 2017-10-24 16:51:03 +0900 (aa9693b3b) @@ -36,9 +36,11 @@ else() PREFIX "" OUTPUT_NAME "stop_word") install(TARGETS stop_word_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") - install(FILES $<TARGET_PDB_FILE:stop_word_token_filter> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:stop_word_token_filter> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(stop_word_token_filter libgroonga) @@ -61,9 +63,11 @@ if(GRN_WITH_LIBSTEMMER) PREFIX "" OUTPUT_NAME "stem") install(TARGETS stem_token_filter DESTINATION "${TOKEN_FILTERS_DIR}") - install(FILES $<TARGET_PDB_FILE:stem_token_filter> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:stem_token_filter> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(stem_token_filter libgroonga ${LIBSTEMMER_LIBRARIES}) endif() Modified: plugins/tokenizers/CMakeLists.txt (+10 -6) =================================================================== --- plugins/tokenizers/CMakeLists.txt 2017-10-13 12:40:54 +0900 (fd561db09) +++ plugins/tokenizers/CMakeLists.txt 2017-10-24 16:51:03 +0900 (ec9c9a28e) @@ -48,9 +48,11 @@ if(GRN_WITH_MECAB) PREFIX "" OUTPUT_NAME "mecab") install(TARGETS mecab_tokenizer DESTINATION "${TOKENIZERS_DIR}") - install(FILES $<TARGET_PDB_FILE:mecab_tokenizer> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:mecab_tokenizer> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(mecab_tokenizer libgroonga ${MECAB_LIBRARIES}) endif() @@ -74,9 +76,11 @@ if(GRN_WITH_KYTEA) PREFIX "" OUTPUT_NAME "kytea") install(TARGETS kytea_tokenizer DESTINATION "${TOKENIZERS_DIR}") - install(FILES $<TARGET_PDB_FILE:kytea_tokenizer> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:kytea_tokenizer> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() target_link_libraries(kytea_tokenizer libgroonga ${KYTEA_LIBRARIES}) endif() Modified: src/CMakeLists.txt (+15 -9) =================================================================== --- src/CMakeLists.txt 2017-10-13 12:40:54 +0900 (e3e008e24) +++ src/CMakeLists.txt 2017-10-24 16:51:03 +0900 (64314cdd5) @@ -27,9 +27,11 @@ set_source_files_properties(${GROONGA_SOURCES} COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga libgroonga) install(TARGETS groonga DESTINATION ${BIN_DIR}) -install(FILES $<TARGET_PDB_FILE:groonga> - DESTINATION "${PDB_DIR}" - OPTIONAL) +if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:groonga> + DESTINATION "${PDB_DIR}" + OPTIONAL) +endif() if(GRN_WITH_MRUBY) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/grndb_sources.am GRNDB_SOURCES) @@ -42,9 +44,11 @@ if(GRN_WITH_MRUBY) COMPILE_DEFINITIONS "${MRUBY_DEFINITIONS}") target_link_libraries(grndb libgroonga) install(TARGETS grndb DESTINATION ${BIN_DIR}) - install(FILES $<TARGET_PDB_FILE:grndb> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:grndb> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() if(NOT WIN32) @@ -65,7 +69,9 @@ 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}) -install(FILES $<TARGET_PDB_FILE:groonga-benchmark> - DESTINATION "${PDB_DIR}" - OPTIONAL) +if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:groonga-benchmark> + DESTINATION "${PDB_DIR}" + OPTIONAL) +endif() Modified: src/suggest/CMakeLists.txt (+13 -9) =================================================================== --- src/suggest/CMakeLists.txt 2017-10-13 12:40:54 +0900 (369d7c7d6) +++ src/suggest/CMakeLists.txt 2017-10-24 16:51:03 +0900 (be39a6cab) @@ -29,9 +29,11 @@ target_link_libraries(groonga-suggest-create-dataset libgroonga) install( TARGETS groonga-suggest-create-dataset DESTINATION ${BIN_DIR}) -install(FILES $<TARGET_PDB_FILE:groonga-suggest-create-dataset> - DESTINATION "${PDB_DIR}" - OPTIONAL) +if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:groonga-suggest-create-dataset> + DESTINATION "${PDB_DIR}" + OPTIONAL) +endif() if(GRN_WITH_LIBEVENT AND GRN_WITH_ZEROMQ AND GRN_WITH_MESSAGE_PACK) set(GRN_WITH_SUGGEST_LEARNER TRUE) @@ -87,10 +89,12 @@ if(GRN_WITH_SUGGEST_LEARNER) install( TARGETS groonga-suggest-learner groonga-suggest-httpd DESTINATION ${BIN_DIR}) - install( - FILES - $<TARGET_PDB_FILE:groonga-suggest-learner> - $<TARGET_PDB_FILE:groonga-suggest-httpd> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install( + FILES + $<TARGET_PDB_FILE:groonga-suggest-learner> + $<TARGET_PDB_FILE:groonga-suggest-httpd> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() endif() Modified: vendor/lz4/CMakeLists.txt (+5 -3) =================================================================== --- vendor/lz4/CMakeLists.txt 2017-10-13 12:40:54 +0900 (478f8cb86) +++ vendor/lz4/CMakeLists.txt 2017-10-24 16:51:03 +0900 (d77f10c90) @@ -83,9 +83,11 @@ if(GRN_WITH_BUNDLED_LZ4) RUNTIME DESTINATION "${BIN_DIR}") install(TARGETS lz4 DESTINATION "${BIN_DIR}") - install(FILES $<TARGET_PDB_FILE:lz4> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:lz4> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() install(FILES "${LZ4_SOURCE_DIR}/lib/lz4.h" "${LZ4_SOURCE_DIR}/lib/lz4frame.h" Modified: vendor/mecab/CMakeLists.txt (+9 -7) =================================================================== --- vendor/mecab/CMakeLists.txt 2017-10-13 12:40:54 +0900 (e581a733b) +++ vendor/mecab/CMakeLists.txt 2017-10-24 16:51:03 +0900 (708d9cb8f) @@ -173,13 +173,15 @@ if(GRN_WITH_BUNDLED_MECAB) DESTINATION "${BIN_DIR}") install(TARGETS mecab-dict-index DESTINATION "${BIN_DIR}") - install( - FILES - $<TARGET_PDB_FILE:libmecab> - $<TARGET_PDB_FILE:mecab> - $<TARGET_PDB_FILE:mecab-dict-index> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install( + FILES + $<TARGET_PDB_FILE:libmecab> + $<TARGET_PDB_FILE:mecab> + $<TARGET_PDB_FILE:mecab-dict-index> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() install(FILES "${MECAB_SOURCE_DIR}/src/mecab.h" DESTINATION "${INCLUDE_DIR}") Modified: vendor/message_pack/CMakeLists.txt (+5 -3) =================================================================== --- vendor/message_pack/CMakeLists.txt 2017-10-13 12:40:54 +0900 (b5a475e24) +++ vendor/message_pack/CMakeLists.txt 2017-10-24 16:51:03 +0900 (3efc2498d) @@ -41,9 +41,11 @@ if(GRN_WITH_BUNDLED_MESSAGE_PACK) ARCHIVE DESTINATION "${LIB_DIR}" LIBRARY DESTINATION "${LIB_DIR}" RUNTIME DESTINATION "${BIN_DIR}") - install(FILES $<TARGET_PDB_FILE:msgpackc> - DESTINATION "${PDB_DIR}" - OPTIONAL) + if(CMAKE_VERSION VERSION_GREATER "3.1") + install(FILES $<TARGET_PDB_FILE:msgpackc> + DESTINATION "${PDB_DIR}" + OPTIONAL) + endif() install(DIRECTORY "${MESSAGE_PACK_SOURCE_DIR}/include/" DESTINATION "${INCLUDE_DIR}" -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171024/c3d0cbec/attachment-0001.htm
