Kouhei Sutou
null+****@clear*****
Mon May 15 22:02:44 JST 2017
Kouhei Sutou 2017-05-15 22:02:44 +0900 (Mon, 15 May 2017) New Revision: d32a120e03ab384951c19a9d26c4a780fa0b739e https://github.com/groonga/groonga/commit/d32a120e03ab384951c19a9d26c4a780fa0b739e Message: cmake: support linking lz4 in embedded static library build https://github.com/MariaDB/server/commit/cc413ce9a368b930aba5e63c0ab013f7b3ab3c04 Based on patch by Sergei Golubchik. Thanks!!! Modified files: CMakeLists.txt lib/CMakeLists.txt Modified: CMakeLists.txt (+14 -7) =================================================================== --- CMakeLists.txt 2017-05-15 12:13:34 +0900 (18e7fe9) +++ CMakeLists.txt 2017-05-15 22:02:44 +0900 (eb33a14) @@ -381,14 +381,16 @@ if(NOT ${GRN_WITH_LZ4} STREQUAL "no") if(GRN_WITH_BUNDLED_LZ4) set(LIBLZ4_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/lz4-${GRN_BUNDLED_LZ4_VERSION}/lib") - set(LIBLZ4_LIBRARY_DIRS - "${CMAKE_CURRENT_BUILD_DIR}/vendor/lz4") - set(LIBLZ4_LIBRARIES liblz4) + set(LIBLZ4_LIBS liblz4) else() if(NOT DEFINED LIBLZ4_FOUND) pkg_check_modules(LIBLZ4 liblz4) endif() if(LIBLZ4_FOUND) + find_library(LIBLZ4_LIBS + NAMES ${LIBLZ4_LIBRARIES} + PATHS ${LIBLZ4_LIBRARY_DIRS} + NO_DEFAULT_PATH) set(GRN_WITH_LZ4 TRUE) else() if(${GRN_WITH_LZ4} STREQUAL "yes") @@ -565,14 +567,16 @@ if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") if(GRN_WITH_BUNDLED_MESSAGE_PACK) set(MESSAGE_PACK_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/msgpack-${GRN_BUNDLED_MESSAGE_PACK_VERSION}/include") - set(MESSAGE_PACK_LIBRARY_DIRS - "${CMAKE_CURRENT_BUILD_DIR}/vendor/message_pack") - set(MESSAGE_PACK_LIBRARIES msgpackc) + set(MESSAGE_PACK_LIBS msgpackc) else() if(NOT DEFINED MESSAGE_PACK_FOUND) pkg_check_modules(MESSAGE_PACK msgpack) endif() if(MESSAGE_PACK_FOUND) + find_library(MESSAGE_PACK_LIBS + NAMES ${MESSAGE_PACK_LIBRARIES} + PATHS ${MESSAGE_PACK_LIBRARY_DIRS} + NO_DEFAULT_PATH) set(GRN_WITH_MESSAGE_PACK TRUE) else() if("${GRN_WITH_MESSAGE_PACK}" STREQUAL "yes" OR @@ -587,7 +591,10 @@ 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) - set(MESSAGE_PACK_LIBRARIES "msgpack") + 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") Modified: lib/CMakeLists.txt (+3 -7) =================================================================== --- lib/CMakeLists.txt 2017-05-15 12:13:34 +0900 (e77ff1c) +++ lib/CMakeLists.txt 2017-05-15 22:02:44 +0900 (281bc95) @@ -24,10 +24,6 @@ include_directories( ${LIBLZ4_INCLUDE_DIRS} ${LIBZSTD_INCLUDE_DIRS} ${MESSAGE_PACK_INCLUDE_DIRS}) -link_directories( - ${LIBLZ4_LIBRARY_DIRS} - ${LIBZSTD_LIBRARY_DIRS} - ${MESSAGE_PACK_LIBRARY_DIRS}) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am LIBGROONGA_SOURCES) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/dat/sources.am LIBGRNDAT_SOURCES) @@ -93,9 +89,9 @@ set(GRN_ALL_LIBRARIES ${RT_LIBS} ${PTHREAD_LIBS} ${Z_LIBS} - ${LIBLZ4_LIBRARIES} - ${LIBZSTD_LIBRARIES} - ${MESSAGE_PACK_LIBRARIES} + ${LIBLZ4_LIBS} + ${LIBZSTD_LIBS} + ${MESSAGE_PACK_LIBS} ${DL_LIBS} ${M_LIBS} ${WS2_32_LIBS} -------------- next part -------------- HTML����������������������������...다운로드
