Kouhei Sutou
null+****@clear*****
Fri Dec 23 22:53:43 JST 2016
Kouhei Sutou 2016-12-23 22:53:43 +0900 (Fri, 23 Dec 2016) New Revision: 2c5710eb626b8779e0ad140dd0ad1b21fd55961e https://github.com/groonga/groonga/commit/2c5710eb626b8779e0ad140dd0ad1b21fd55961e Message: cmake: support Onigmo 6.0 Modified files: CMakeLists.txt vendor/onigmo/CMakeLists.txt Modified: CMakeLists.txt (+1 -1) =================================================================== --- CMakeLists.txt 2016-12-22 14:58:23 +0900 (2d0cc1c) +++ CMakeLists.txt 2016-12-23 22:53:43 +0900 (2a07309) @@ -616,7 +616,7 @@ else() set(MRUBY_INCLUDE_DIRS "") set(MRUBY_LIBS "") endif() -set(MRUBY_DEFINITIONS "MRB_INT64") +set(MRUBY_DEFINITIONS "MRB_INT64" "HAVE_ONIGMO_H") # TODO: Support using system Onigmo instead of bundled Onigmo. set(GRN_WITH_ONIGMO ON) Modified: vendor/onigmo/CMakeLists.txt (+39 -26) =================================================================== --- vendor/onigmo/CMakeLists.txt 2016-12-22 14:58:23 +0900 (8312a12) +++ vendor/onigmo/CMakeLists.txt 2016-12-23 22:53:43 +0900 (27717a0) @@ -21,6 +21,12 @@ if(GRN_WITH_ONIGMO) macro(ac_check_sizeof type) string(TOUPPER "${type}" output_variable_base_name) + string(REPLACE "*" "P" + output_variable_base_name + "${output_variable_base_name}") + string(REPLACE " " "_" + output_variable_base_name + "${output_variable_base_name}") set(output_variable_name "ONIG_SIZEOF_${output_variable_base_name}") check_type_size(${type} ${output_variable_name}) if(HAVE_${output_variable_name}) @@ -33,6 +39,8 @@ if(GRN_WITH_ONIGMO) ac_check_sizeof(short) ac_check_sizeof(int) ac_check_sizeof(long) + ac_check_sizeof("void*") + ac_check_sizeof("long long") add_definitions(-DHAVE_STDARG_H) add_definitions(-DHAVE_STDINT_H) @@ -49,13 +57,11 @@ if(GRN_WITH_ONIGMO) add_definitions(-DHAVE_INTTYPES_H) endif() - add_definitions(-DUSE_MULTI_THREAD_SYSTEM) - add_definitions(-DUSE_DEFAULT_MULTI_THREAD_SYSTEM) - include_directories( BEFORE ${ONIGMO_BINARY_DIR} ${ONIGMO_SOURCE_DIR} + ${ONIGMO_SOURCE_DIR}/enc/unicode ) set(ONIGMO_SOURCES @@ -78,39 +84,46 @@ if(GRN_WITH_ONIGMO) "${ONIGMO_SOURCE_DIR}/regposerr.c" "${ONIGMO_SOURCE_DIR}/enc/unicode.c" "${ONIGMO_SOURCE_DIR}/enc/ascii.c" - "${ONIGMO_SOURCE_DIR}/enc/utf8.c" - "${ONIGMO_SOURCE_DIR}/enc/utf16_be.c" - "${ONIGMO_SOURCE_DIR}/enc/utf16_le.c" - "${ONIGMO_SOURCE_DIR}/enc/utf32_be.c" - "${ONIGMO_SOURCE_DIR}/enc/utf32_le.c" + "${ONIGMO_SOURCE_DIR}/enc/utf_8.c" + "${ONIGMO_SOURCE_DIR}/enc/utf_16be.c" + "${ONIGMO_SOURCE_DIR}/enc/utf_16le.c" + "${ONIGMO_SOURCE_DIR}/enc/utf_32be.c" + "${ONIGMO_SOURCE_DIR}/enc/utf_32le.c" "${ONIGMO_SOURCE_DIR}/enc/unicode/casefold.h" "${ONIGMO_SOURCE_DIR}/enc/unicode/name2ctype.h" "${ONIGMO_SOURCE_DIR}/enc/euc_jp.c" - "${ONIGMO_SOURCE_DIR}/enc/sjis.c" - "${ONIGMO_SOURCE_DIR}/enc/cp932.c" + "${ONIGMO_SOURCE_DIR}/enc/shift_jis.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_31j.c" "${ONIGMO_SOURCE_DIR}/enc/jis/props.h" # "${ONIGMO_SOURCE_DIR}/enc/jis/props.kwd" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_1.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_2.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_3.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_4.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_5.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_6.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_7.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_8.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_9.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_10.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_11.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_13.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_14.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_15.c" - "${ONIGMO_SOURCE_DIR}/enc/iso8859_16.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859.h" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_1.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_2.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_3.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_4.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_5.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_6.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_7.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_8.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_9.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_10.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_11.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_13.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_14.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_15.c" + "${ONIGMO_SOURCE_DIR}/enc/iso_8859_16.c" "${ONIGMO_SOURCE_DIR}/enc/euc_tw.c" "${ONIGMO_SOURCE_DIR}/enc/euc_kr.c" "${ONIGMO_SOURCE_DIR}/enc/big5.c" "${ONIGMO_SOURCE_DIR}/enc/gb18030.c" "${ONIGMO_SOURCE_DIR}/enc/koi8_r.c" - "${ONIGMO_SOURCE_DIR}/enc/cp1251.c" + "${ONIGMO_SOURCE_DIR}/enc/koi8_u.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1250.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1251.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1252.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1253.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1254.c" + "${ONIGMO_SOURCE_DIR}/enc/windows_1257.c" ) set(ONIGMO_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") -------------- next part -------------- HTML����������������������������...Download