Kouhei Sutou 2019-03-24 17:16:58 +0900 (Sun, 24 Mar 2019) Revision: 7df5b54f6db346b6845499baba611b3dc3322685 https://github.com/mroonga/mroonga/commit/7df5b54f6db346b6845499baba611b3dc3322685 Message: cmake: remove needless code to use bundled libraries It's done in Groonga. Modified files: CMakeLists.txt appveyor.yml Modified: CMakeLists.txt (+0 -14) =================================================================== --- CMakeLists.txt 2019-03-22 10:38:58 +0900 (8a7f9b64) +++ CMakeLists.txt 2019-03-24 17:16:58 +0900 (66bf1733) @@ -106,20 +106,6 @@ if(MRN_GROONGA_BUNDLED) set(GROONGA_NORMALIZER_MYSQL_EMBED ON) endif() - file(READ "${MRN_BUNDLED_GROONGA_DIR}/bundled_lz4_version" - MRN_BUNDLED_LZ4_VERSION) - string(STRIP - "${MRN_BUNDLED_LZ4_VERSION}" - MRN_BUNDLED_LZ4_VERSION) - set(MRN_BUNDLED_LZ4_DIR - "${MRN_BUNDLED_GROONGA_DIR}/vendor/lz4-${MRN_BUNDLED_LZ4_VERSION}") - if(EXISTS ${MRN_BUNDLED_LZ4_DIR}) - set(GRN_WITH_BUNDLED_LZ4 ON) - set(GRN_WITH_LZ4 "yes") - else() - set(GRN_WITH_LZ4 "no") - endif() - add_subdirectory("${MRN_BUNDLED_GROONGA_RELATIVE_DIR}") else() set(MRN_GROONGA_EMBED OFF) Modified: appveyor.yml (+0 -2) =================================================================== --- appveyor.yml 2019-03-22 10:38:58 +0900 (8b4f4808) +++ appveyor.yml 2019-03-24 17:16:58 +0900 (6458f391) @@ -57,8 +57,6 @@ build_script: - cmake ..\source -G "%CMAKE_GENERATOR_NAME%" -DMRN_GROONGA_EMBED=OFF -DMRN_GROONGA_NORMALIZER_MYSQL_EMBED=OFF - -DGRN_WITH_BUNDLED_LZ4=ON - -DGRN_WITH_BUNDLED_MECAB=ON - cmake --build . --config RelWithDebInfo - cmake --build . --config RelWithDebInfo --target package - move *.zip ..\ -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20190324/f8f1cf4a/attachment.html>
