susumu.yata
null+****@clear*****
Thu Jan 29 17:38:31 JST 2015
susumu.yata 2015-01-29 17:38:31 +0900 (Thu, 29 Jan 2015) New Revision: d9ca6557dd90b92385836196f1fd558eb750e650 https://github.com/groonga/groonga-normalizer-mysql/commit/d9ca6557dd90b92385836196f1fd558eb750e650 Message: cmake: don't install additional modules if bundled with MariaDB Patch by Kentoku Shiba. Thanks!!! Modified files: CMakeLists.txt normalizers/CMakeLists.txt Modified: CMakeLists.txt (+5 -3) =================================================================== --- CMakeLists.txt 2014-11-15 18:33:29 +0900 (9cd2b8f) +++ CMakeLists.txt 2015-01-29 17:38:31 +0900 (484a7d6) @@ -58,6 +58,8 @@ configure_file( "${CMAKE_CURRENT_BINARY_DIR}/groonga-normalizer-mysql.pc" @ONLY) -install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/groonga-normalizer-mysql.pc" - DESTINATION "lib/pkgconfig/") +if(NOT GROONGA_NORMALIZER_MYSQL_FOUND) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/groonga-normalizer-mysql.pc" + DESTINATION "lib/pkgconfig/") +endif() Modified: normalizers/CMakeLists.txt (+3 -1) =================================================================== --- normalizers/CMakeLists.txt 2014-11-15 18:33:29 +0900 (249792d) +++ normalizers/CMakeLists.txt 2015-01-29 17:38:31 +0900 (ae290b6) @@ -22,4 +22,6 @@ set_target_properties(mysql_normalizer PROPERTIES PREFIX "" OUTPUT_NAME "mysql") target_link_libraries(mysql_normalizer ${GROONGA_LIBRARIES}) -install(TARGETS mysql_normalizer DESTINATION "${NORMALIZERS_DIR}") +if(NOT MRN_GROONGA_BUNDLED) + install(TARGETS mysql_normalizer DESTINATION "${NORMALIZERS_DIR}") +endif() -------------- next part -------------- HTML����������������������������...Download
