Kouhei Sutou
null+****@clear*****
Thu Nov 23 11:19:54 JST 2017
Kouhei Sutou 2017-11-23 11:19:54 +0900 (Thu, 23 Nov 2017) New Revision: 17176b47da028f04934322ba041f52e7da645911 https://github.com/groonga/groonga/commit/17176b47da028f04934322ba041f52e7da645911 Message: cmake: ensure clean _LIBS variable defined by pkg_check_modules() Modified files: CMakeLists.txt Modified: CMakeLists.txt (+2 -4) =================================================================== --- CMakeLists.txt 2017-11-23 08:00:13 +0900 (c184f07f7) +++ CMakeLists.txt 2017-11-23 11:19:54 +0900 (fb4a19fb7) @@ -384,6 +384,7 @@ if(NOT ${GRN_WITH_LZ4} STREQUAL "no") else() if(NOT DEFINED LIBLZ4_FOUND) pkg_check_modules(LIBLZ4 liblz4) + unset(LIBLZ4_LIBS) unset(LIBLZ4_LIBS CACHE) endif() if(LIBLZ4_FOUND) @@ -576,6 +577,7 @@ if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") else() if(NOT DEFINED MESSAGE_PACK_FOUND) pkg_check_modules(MESSAGE_PACK msgpack) + unset(MESSAGE_PACK_LIBS) unset(MESSAGE_PACK_LIBS CACHE) endif() if(MESSAGE_PACK_FOUND) @@ -602,10 +604,6 @@ if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") ac_check_lib(msgpack msgpack_version "${MESSAGE_PACK_LIBRARY_DIRS}") set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) if(HAVE_LIBMSGPACK) - find_library(MESSAGE_PACK_LIBS - NAMES "msgpack" - PATHS ${MESSAGE_PACK_LIBRARY_DIRS} - NO_DEFAULT_PATH) set(GRN_WITH_MESSAGE_PACK TRUE) else() if(${GRN_WITH_MESSAGE_PACK} STREQUAL "yes") -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171123/de01c32b/attachment-0001.htm
