susumu.yata
null+****@clear*****
Fri Oct 10 09:35:52 JST 2014
susumu.yata 2014-10-10 09:35:52 +0900 (Fri, 10 Oct 2014) New Revision: 615e2a27f5779b64575556d368c85e491e486c2f https://github.com/groonga/groonga/commit/615e2a27f5779b64575556d368c85e491e486c2f Message: cmake: add a prefix GRN_ to options MECAB_CONFIG -> GRN_MECAB_CONFIG MECAB_CONFIG_ABSOLUTE_PATH -> GRN_MECAB_CONFIG_ABSOLUTE_PATH GitHub: ref mroonga/mroonga#23 Modified files: CMakeLists.txt Modified: CMakeLists.txt (+7 -7) =================================================================== --- CMakeLists.txt 2014-10-09 17:37:39 +0900 (b8367f4) +++ CMakeLists.txt 2014-10-10 09:35:52 +0900 (3db95ae) @@ -1,4 +1,4 @@ -# Copyright(C) 2012-2013 Brazil +# Copyright(C) 2012-2014 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -307,15 +307,15 @@ endif() set(GRN_WITH_MECAB "auto" CACHE STRING "use MeCab for morphological analysis") if(NOT ${GRN_WITH_MECAB} STREQUAL "no") - set(MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path") + set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path") if(NOT CMAKE_CROSSCOMPILING) - find_program(MECAB_CONFIG_ABSOLUTE_PATH "${MECAB_CONFIG}") + find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}") endif() - if(EXISTS "${MECAB_CONFIG_ABSOLUTE_PATH}") - execute_process(COMMAND "${MECAB_CONFIG_ABSOLUTE_PATH}" --inc-dir + if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}") + execute_process(COMMAND "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}" --inc-dir OUTPUT_VARIABLE MECAB_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND "${MECAB_CONFIG_ABSOLUTE_PATH}" --libs-only-L + execute_process(COMMAND "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}" --libs-only-L OUTPUT_VARIABLE MECAB_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) set(MECAB_LIBRARIES "mecab") @@ -333,7 +333,7 @@ if(NOT ${GRN_WITH_MECAB} STREQUAL "no") endif() else() if(${GRN_WITH_MECAB} STREQUAL "yes") - message(FATAL_ERROR "No mecab-config found: <${MECAB_CONFIG}>") + message(FATAL_ERROR "No mecab-config found: <${GRN_MECAB_CONFIG}>") endif() set(GRN_WITH_MECAB FALSE) endif() -------------- next part -------------- HTML����������������������������...ダウンロード
