Kouhei Sutou
null+****@clear*****
Tue Sep 8 23:18:55 JST 2015
Kouhei Sutou 2015-09-08 23:18:55 +0900 (Tue, 08 Sep 2015) New Revision: cbbc0f6dc284484c930064a8b3ed936a7787ec27 https://github.com/groonga/groonga/commit/cbbc0f6dc284484c930064a8b3ed936a7787ec27 Message: cmake: don't run pkg-config twice Patch by Sergei Golubchik. Thanks!!! Modified files: CMakeLists.txt Modified: CMakeLists.txt (+12 -4) =================================================================== --- CMakeLists.txt 2015-09-08 22:57:48 +0900 (11d3c2e) +++ CMakeLists.txt 2015-09-08 23:18:55 +0900 (f682d0d) @@ -368,7 +368,9 @@ endif() set(GRN_WITH_LZ4 "auto" CACHE STRING "Support data compression by LZ4.") if(NOT ${GRN_WITH_LZ4} STREQUAL "no") - pkg_check_modules(LIBLZ4 liblz4) + if(NOT DEFINED LIBLZ4_FOUND) + pkg_check_modules(LIBLZ4 liblz4) + endif() if(LIBLZ4_FOUND) set(GRN_WITH_LZ4 TRUE) else() @@ -419,7 +421,9 @@ endif() set(GRN_WITH_KYTEA "auto" CACHE STRING "use KyTea for morphological analysis") if(NOT ${GRN_WITH_KYTEA} STREQUAL "no") - pkg_check_modules(KYTEA kytea) + if(NOT DEFINED KYTEA_FOUND) + pkg_check_modules(KYTEA kytea) + endif() if(KYTEA_FOUND) set(GRN_WITH_KYTEA TRUE) else() @@ -467,7 +471,9 @@ endif() set(GRN_WITH_ZEROMQ "auto" CACHE STRING "use ZeroMQ for suggestion") if(NOT ${GRN_WITH_ZEROMQ} STREQUAL "no") - pkg_check_modules(ZEROMQ libzmq) + if(NOT DEFINED ZEROMQ_FOUND) + pkg_check_modules(ZEROMQ libzmq) + endif() if(ZEROMQ_FOUND) set(GRN_WITH_ZEROMQ TRUE) else() @@ -510,7 +516,9 @@ endif() set(GRN_WITH_MESSAGE_PACK "auto" CACHE STRING "use MessagePack for suggestion") if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") - pkg_check_modules(MESSAGE_PACK msgpack) + if(NOT DEFINED MESSAGE_PACK_FOUND) + pkg_check_modules(MESSAGE_PACK msgpack) + endif() if(MESSAGE_PACK_FOUND) set(GRN_WITH_MESSAGE_PACK TRUE) else() -------------- next part -------------- HTML����������������������������...Download