Kouhei Sutou
null+****@clear*****
Thu Apr 25 15:05:04 JST 2013
Kouhei Sutou 2013-04-25 15:05:04 +0900 (Thu, 25 Apr 2013) New Revision: bc6865f05fb4cba07745e3859ec6853413ba0a84 https://github.com/groonga/groonga/commit/bc6865f05fb4cba07745e3859ec6853413ba0a84 Message: cmake: add GRN_ prefix to avoid name conflict Modified files: CMakeLists.txt lib/CMakeLists.txt src/suggest/CMakeLists.txt Modified: CMakeLists.txt (+47 -46) =================================================================== --- CMakeLists.txt 2013-04-25 14:34:17 +0900 (dbd3aa3) +++ CMakeLists.txt 2013-04-25 15:05:04 +0900 (ef822fa) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -134,8 +134,8 @@ if(UNIX) endif() endif() -option(WITH_NFKC "use NFKC based UTF8 normalization." ON) -option(WITH_STATIC "build static library." OFF) +option(GRN_WITH_NFKC "use NFKC based UTF8 normalization." ON) +option(GRN_WITH_STATIC "build static library." OFF) if(WIN32) ac_check_headers(winsock2.h) @@ -189,25 +189,25 @@ else() endif() endif() -option(WITH_ZLIB "use zlib for data compression." OFF) -if(WITH_ZLIB) +option(GRN_WITH_ZLIB "use zlib for data compression." OFF) +if(GRN_WITH_ZLIB) ac_check_lib(z compress) if(NOT HAVE_LIBZ) message(FATAL_ERROR "No libz found") endif() endif() -option(WITH_LZO "use LZO for data compression." OFF) -if(WITH_LZO) +option(GRN_WITH_LZO "use LZO for data compression." OFF) +if(GRN_WITH_LZO) ac_check_lib(lzo2 lzo1_compress) if(NOT HAVE_LIBLZO2) message(FATAL_ERROR "No liblzo2 found") endif() endif() -set(WITH_MECAB "auto" +set(GRN_WITH_MECAB "auto" CACHE STRING "use MeCab for morphological analysis") -if(NOT ${WITH_MECAB} STREQUAL "no") +if(NOT ${GRN_WITH_MECAB} STREQUAL "no") set(MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path") if(NOT CMAKE_CROSSCOMPILING) find_program(MECAB_CONFIG_ABSOLUTE_PATH "${MECAB_CONFIG}") @@ -222,109 +222,110 @@ if(NOT ${WITH_MECAB} STREQUAL "no") set(MECAB_LIBRARIES "mecab") ac_check_lib(${MECAB_LIBRARIES} mecab_new) if(HAVE_LIBMECAB) - set(WITH_MECAB TRUE) + set(GRN_WITH_MECAB TRUE) else() - if(${WITH_MECAB} STREQUAL "yes") + if(${GRN_WITH_MECAB} STREQUAL "yes") message(FATAL_ERROR "No MeCab library found: " "include directories: <${MECAB_INCLUDE_DIRS}>, " "library directories: <${MECAB_LIBRARY_DIRS}>") endif() - set(WITH_MECAB FALSE) + set(GRN_WITH_MECAB FALSE) endif() else() - if(${WITH_MECAB} STREQUAL "yes") + if(${GRN_WITH_MECAB} STREQUAL "yes") message(FATAL_ERROR "No mecab-config found: <${MECAB_CONFIG}>") endif() - set(WITH_MECAB FALSE) + set(GRN_WITH_MECAB FALSE) endif() else() - set(WITH_MECAB FALSE) + set(GRN_WITH_MECAB FALSE) endif() -set(WITH_KYTEA "auto" +set(GRN_WITH_KYTEA "auto" CACHE STRING "use KyTea for morphological analysis") -if(NOT ${WITH_KYTEA} STREQUAL "no") +if(NOT ${GRN_WITH_KYTEA} STREQUAL "no") pkg_check_modules(KYTEA kytea) if(KYTEA_FOUND) - set(WITH_KYTEA TRUE) + set(GRN_WITH_KYTEA TRUE) else() - if(${WITH_KYTEA} STREQUAL "yes") + if(${GRN_WITH_KYTEA} STREQUAL "yes") message(FATAL_ERROR "No KyTea found") endif() - set(WITH_KYTEA FALSE) + set(GRN_WITH_KYTEA FALSE) endif() else() - set(WITH_KYTEA FALSE) + set(GRN_WITH_KYTEA FALSE) endif() -set(WITH_ZEROMQ "auto" +set(GRN_WITH_ZEROMQ "auto" CACHE STRING "use ZeroMQ for suggestion") -if(NOT ${WITH_ZEROMQ} STREQUAL "no") +if(NOT ${GRN_WITH_ZEROMQ} STREQUAL "no") pkg_check_modules(ZEROMQ libzmq) if(ZEROMQ_FOUND) - set(WITH_ZEROMQ TRUE) + set(GRN_WITH_ZEROMQ TRUE) else() - if(${WITH_ZEROMQ} STREQUAL "yes") + if(${GRN_WITH_ZEROMQ} STREQUAL "yes") message(FATAL_ERROR "No ZeroMQ found") endif() - set(WITH_ZEROMQ FALSE) + set(GRN_WITH_ZEROMQ FALSE) endif() else() - set(WITH_ZEROMQ FALSE) + set(GRN_WITH_ZEROMQ FALSE) endif() -set(WITH_LIBEVENT "auto" +set(GRN_WITH_LIBEVENT "auto" CACHE STRING "use libevent for suggestion") -if(NOT ${WITH_LIBEVENT} STREQUAL "no") - if("${WITH_LIBEVENT}" STREQUAL "yes" OR "${WITH_LIBEVENT}" STREQUAL "auto") +if(NOT ${GRN_WITH_LIBEVENT} STREQUAL "no") + if("${GRN_WITH_LIBEVENT}" STREQUAL "yes" OR + "${GRN_WITH_LIBEVENT}" STREQUAL "auto") set(LIBEVENT_INCLUDE_DIRS "") set(LIBEVENT_LIBRARY_DIRS "") else() - set(LIBEVENT_INCLUDE_DIRS "${WITH_LIBEVENT}/include") - set(LIBEVENT_LIBRARY_DIRS "${WITH_LIBEVENT}/lib") + set(LIBEVENT_INCLUDE_DIRS "${GRN_WITH_LIBEVENT}/include") + set(LIBEVENT_LIBRARY_DIRS "${GRN_WITH_LIBEVENT}/lib") endif() set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) ac_check_lib(event event_init "${LIBEVENT_LIBRARY_DIRS}") set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) if(HAVE_LIBEVENT) set(LIBEVENT_LIBRARIES "event") - set(WITH_LIBEVENT TRUE) + set(GRN_WITH_LIBEVENT TRUE) else() - if(${WITH_LIBEVENT} STREQUAL "yes") + if(${GRN_WITH_LIBEVENT} STREQUAL "yes") message(FATAL_ERROR "No libevent found") endif() - set(WITH_LIBEVENT FALSE) + set(GRN_WITH_LIBEVENT FALSE) endif() else() - set(WITH_LIBEVENT FALSE) + set(GRN_WITH_LIBEVENT FALSE) endif() -set(WITH_MESSAGE_PACK "auto" +set(GRN_WITH_MESSAGE_PACK "auto" CACHE STRING "use MessagePack for suggestion") -if(NOT ${WITH_MESSAGE_PACK} STREQUAL "no") - if("${WITH_MESSAGE_PACK}" STREQUAL "yes" OR - "${WITH_MESSAGE_PACK}" STREQUAL "auto") +if(NOT ${GRN_WITH_MESSAGE_PACK} STREQUAL "no") + if("${GRN_WITH_MESSAGE_PACK}" STREQUAL "yes" OR + "${GRN_WITH_MESSAGE_PACK}" STREQUAL "auto") set(MESSAGE_PACK_INCLUDE_DIRS "") set(MESSAGE_PACK_LIBRARY_DIRS "") else() - set(MESSAGE_PACK_INCLUDE_DIRS "${WITH_MESSAGE_PACK}/include") - set(MESSAGE_PACK_LIBRARY_DIRS "${WITH_MESSAGE_PACK}/lib") + set(MESSAGE_PACK_INCLUDE_DIRS "${GRN_WITH_MESSAGE_PACK}/include") + set(MESSAGE_PACK_LIBRARY_DIRS "${GRN_WITH_MESSAGE_PACK}/lib") endif() set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) 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") - set(WITH_MESSAGE_PACK TRUE) + set(GRN_WITH_MESSAGE_PACK TRUE) else() - if(${WITH_MESSAGE_PACK} STREQUAL "yes") + if(${GRN_WITH_MESSAGE_PACK} STREQUAL "yes") message(FATAL_ERROR "No MessagePack found") endif() - set(WITH_MESSAGE_PACK FALSE) + set(GRN_WITH_MESSAGE_PACK FALSE) endif() else() - set(WITH_MESSAGE_PACK FALSE) + set(GRN_WITH_MESSAGE_PACK FALSE) endif() add_subdirectory(lib) Modified: lib/CMakeLists.txt (+3 -3) =================================================================== --- lib/CMakeLists.txt 2013-04-25 14:34:17 +0900 (176eed7) +++ lib/CMakeLists.txt 2013-04-25 15:05:04 +0900 (a39a7e1) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,7 @@ string(REGEX REPLACE "([^;]+)" "dat/\\1" add_library(libgroonga SHARED ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga") -if(WITH_STATIC) +if(GRN_WITH_STATIC) add_library(libgroonga_static STATIC ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) set_target_properties(libgroonga_static PROPERTIES OUTPUT_NAME "groonga") endif() @@ -43,7 +43,7 @@ install(TARGETS libgroonga ARCHIVE DESTINATION "${LIB_DIR}" LIBRARY DESTINATION "${LIB_DIR}" RUNTIME DESTINATION "${BIN_DIR}") -if(WITH_STATIC) +if(GRN_WITH_STATIC) install(TARGETS libgroonga_static ARCHIVE DESTINATION "${LIB_DIR}" Modified: src/suggest/CMakeLists.txt (+4 -4) =================================================================== --- src/suggest/CMakeLists.txt 2013-04-25 14:34:17 +0900 (786f27c) +++ src/suggest/CMakeLists.txt 2013-04-25 15:05:04 +0900 (fcf8172) @@ -24,13 +24,13 @@ install( TARGETS groonga-suggest-create-dataset DESTINATION ${BIN_DIR}) -if(WITH_LIBEVENT AND WITH_ZEROMQ AND WITH_MESSAGE_PACK) - set(WITH_SUGGEST_LEARNER TRUE) +if(GRN_WITH_LIBEVENT AND GRN_WITH_ZEROMQ AND GRN_WITH_MESSAGE_PACK) + set(GRN_WITH_SUGGEST_LEARNER TRUE) else() - set(WITH_SUGGEST_LEARNER FALSE) + set(GRN_WITH_SUGGEST_LEARNER FALSE) endif() -if(WITH_SUGGEST_LEARNER) +if(GRN_WITH_SUGGEST_LEARNER) include_directories( ${LIBEVENT_INCLUDE_DIRS} ${ZEROMQ_INCLUDE_DIRS} -------------- next part -------------- HTML����������������������������...Download