Kouhei Sutou
null+****@clear*****
Mon Dec 15 14:51:16 JST 2014
Kouhei Sutou 2014-12-15 14:51:16 +0900 (Mon, 15 Dec 2014) New Revision: 9bcbc48cd45e78fa726c4830da75bf7c330a1bde https://github.com/groonga/groonga/commit/9bcbc48cd45e78fa726c4830da75bf7c330a1bde Message: cmake: need to use LZ4 information extracted by pkg-config The previous change didn't work... Modified files: lib/CMakeLists.txt Modified: lib/CMakeLists.txt (+5 -2) =================================================================== --- lib/CMakeLists.txt 2014-12-15 14:46:40 +0900 (abb7903) +++ lib/CMakeLists.txt 2014-12-15 14:51:16 +0900 (1ee31fa) @@ -19,7 +19,10 @@ add_definitions( include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/dat - ${MRUBY_INCLUDE_DIRS}) + ${MRUBY_INCLUDE_DIRS} + ${LIBLZ4_INCLUDE_DIRS}) +link_directories( + ${LIBLZ4_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) @@ -47,7 +50,7 @@ target_link_libraries(libgroonga ${RT_LIBS} ${PTHREAD_LIBS} ${Z_LIBS} - ${LZ4_LIBS} + ${LIBLZ4_LIBRARIES} ${DL_LIBS} ${WS2_32_LIBS}) -------------- next part -------------- HTML����������������������������...다운로드
