Kouhei Sutou 2019-03-24 05:54:09 +0900 (Sun, 24 Mar 2019) Revision: 86406e8a16b224e5f99171a9c299bda1c2506fa1 https://github.com/groonga/groonga/commit/86406e8a16b224e5f99171a9c299bda1c2506fa1 Message: cmake: show found library Modified files: CMakeLists.txt Modified: CMakeLists.txt (+23 -9) =================================================================== --- CMakeLists.txt 2019-03-24 05:29:24 +0900 (07a88f113) +++ CMakeLists.txt 2019-03-24 05:54:09 +0900 (10539ba26) @@ -415,19 +415,22 @@ if(NOT ${GRN_WITH_LZ4} STREQUAL "no") NAMES ${LIBLZ4_LIBRARIES}) endif() set(GRN_WITH_LZ4 TRUE) + message(STATUS "LZ4: ${LIBLZ4_LIBS}") else() - set(GRN_BUNDLDED_LZ4_DIR + set(GRN_BUNDLED_LZ4_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/lz4-${GRN_BUNDLED_LZ4_VERSION}") if(EXISTS ${GRN_BUNDLED_LZ4_DIR}) set(LIBLZ4_INCLUDE_DIRS "${GRN_BUNDLED_LZ4_DIR}/lib") set(LIBLZ4_LIBS liblz4) set(GRN_WITH_BUNDLED_LZ4 TRUE) set(GRN_WITH_LZ4 TRUE) + message(STATUS "LZ4: ${LIBLZ4_LIBS} (bundled)") else() if(${GRN_WITH_LZ4} STREQUAL "yes") message(FATAL_ERROR "No LZ4 found") endif() set(GRN_WITH_LZ4 FALSE) + message(STATUS "No LZ4") endif() endif() else() @@ -461,10 +464,13 @@ if(NOT ${GRN_WITH_MECAB} STREQUAL "no") execute_process(COMMAND "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}" --libs-only-L OUTPUT_VARIABLE MECAB_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) - set(MECAB_LIBRARIES "mecab") - ac_check_lib(${MECAB_LIBRARIES} mecab_new) - if(HAVE_LIBMECAB) + find_library(MECAB_LIBRARIES + NAMES mecab + PATHS ${MECAB_LIBRARY_DIRS} + NO_DEFAULT_PATH) + if(MECAB_LIBRARIES) set(GRN_WITH_MECAB TRUE) + message(STATUS "MeCab: ${MECAB_LIBRARIES}") else() if(${GRN_WITH_MECAB} STREQUAL "yes") message(FATAL_ERROR @@ -473,6 +479,7 @@ if(NOT ${GRN_WITH_MECAB} STREQUAL "no") "library directories: <${MECAB_LIBRARY_DIRS}>") endif() set(GRN_WITH_MECAB FALSE) + message(STATUS "No MeCab: ${MECAB_LIBRARY_DIRS}") endif() else() set(GRN_BUNDLED_MECAB_DIR @@ -483,11 +490,13 @@ if(NOT ${GRN_WITH_MECAB} STREQUAL "no") set(MECAB_LIBRARIES libmecab) set(GRN_WITH_MECAB TRUE) set(GRN_WITH_BUNDLED_MECAB TRUE) + message(STATUS "MeCab: ${MECAB_LIBRARIES} (bundled)") else() if(${GRN_WITH_MECAB} STREQUAL "yes") message(FATAL_ERROR "No mecab-config found: <${GRN_MECAB_CONFIG}>") endif() set(GRN_WITH_MECAB FALSE) + message(STATUS "No MeCab") endif() endif() else() @@ -615,21 +624,24 @@ if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") NAMES ${MESSAGE_PACK_LIBRARIES}) endif() set(GRN_WITH_MESSAGE_PACK TRUE) + message(STATUS "MessagePack: ${MESSAGE_PACK_LIBS}") else() if("${GRN_WITH_MESSAGE_PACK}" STREQUAL "yes" OR "${GRN_WITH_MESSAGE_PACK}" STREQUAL "auto") set(MESSAGE_PACK_INCLUDE_DIRS "") set(MESSAGE_PACK_LIBRARY_DIRS "") + find_library(MESSAGE_PACK_LIBS NAMES msgpackc) else() set(MESSAGE_PACK_INCLUDE_DIRS "${GRN_WITH_MESSAGE_PACK}/include") set(MESSAGE_PACK_LIBRARY_DIRS "${GRN_WITH_MESSAGE_PACK}/lib") + find_library(MESSAGE_PACK_LIBS + NAMES msgpackc + PATHS ${MESSAGE_PACK_LIBRARY_DIRS} + NO_DEFAULT_PATH) endif() - set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) - ac_check_lib(msgpackc msgpack_version "${MESSAGE_PACK_LIBRARY_DIRS}") - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) - if(HAVE_LIBMSGPACKC) - set(MESSAGE_PACK_LIBS msgpackc) + if(MESSAGE_PACK_LIBS) set(GRN_WITH_MESSAGE_PACK TRUE) + message(STATUS "MessagePack: ${MESSAGE_PACK_LIBS}") else() set(GRN_BUNDLED_MESSAGE_PACK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/msgpack-${GRN_BUNDLED_MESSAGE_PACK_VERSION}") @@ -638,11 +650,13 @@ if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") set(MESSAGE_PACK_LIBS msgpackc) set(GRN_WITH_BUNDLED_MESSAGE_PACK TRUE) set(GRN_WITH_MESSAGE_PACK TRUE) + message(STATUS "MessagePack: ${MESSAGE_PACK_LIBS} (bundled)") else() if(${GRN_WITH_MESSAGE_PACK} STREQUAL "yes") message(FATAL_ERROR "No MessagePack found") endif() set(GRN_WITH_MESSAGE_PACK FALSE) + message(STATUS "No MessagePack") endif() endif() endif() -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190324/23d642f0/attachment-0001.html>
