Kouhei Sutou
null+****@clear*****
Sat May 9 10:51:55 JST 2015
Kouhei Sutou 2015-05-09 10:51:55 +0900 (Sat, 09 May 2015) New Revision: 925ef68fe9ce6d6f41003181ede0ee360281e9be https://github.com/groonga/groonga/commit/925ef68fe9ce6d6f41003181ede0ee360281e9be Message: cmake: add definitions for Onigmo Added files: vendor/onigmo/config.h.cmake Modified files: .gitignore vendor/onigmo/CMakeLists.txt vendor/onigmo/Makefile.am Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2015-05-08 23:46:03 +0900 (2bbabac) +++ .gitignore 2015-05-09 10:51:55 +0900 (39a8b34) @@ -8,6 +8,7 @@ *.gcno *.gcda *.cmake +!config.h.cmake .deps .ditz-config .gdb_history Modified: vendor/onigmo/CMakeLists.txt (+13 -0) =================================================================== --- vendor/onigmo/CMakeLists.txt 2015-05-08 23:46:03 +0900 (0f79347) +++ vendor/onigmo/CMakeLists.txt 2015-05-09 10:51:55 +0900 (e52bb1d) @@ -34,12 +34,23 @@ if(GRN_WITH_ONIGMO) ac_check_sizeof(int) ac_check_sizeof(long) + add_definitions(-DHAVE_STDARG_H) + add_definitions(-DHAVE_STDINT_H) + add_definitions(-DHAVE_STDLIB_H) + add_definitions(-DHAVE_STRING_H) + add_definitions(-DHAVE_SYS_TYPES_H) + + add_definitions(-DSTDC_HEADERS) + if(MSVC) add_definitions(-Dinline=__inline) add_definitions(-D_CRT_SECURE_NO_WARNINGS) + else() + add_definitions(-DHAVE_INTTYPES_H) endif() include_directories( + BEFORE ${ONIGMO_BINARY_DIR} ${ONIGMO_SOURCE_DIR} ) @@ -107,4 +118,6 @@ if(GRN_WITH_ONIGMO) onigmo PROPERTIES POSITION_INDEPENDENT_CODE ON) + + configure_file(config.h.cmake "${ONIGMO_BINARY_DIR}/config.h") endif() Modified: vendor/onigmo/Makefile.am (+1 -0) =================================================================== --- vendor/onigmo/Makefile.am 2015-05-08 23:46:03 +0900 (73632eb) +++ vendor/onigmo/Makefile.am 2015-05-09 10:51:55 +0900 (cbd419d) @@ -1,5 +1,6 @@ EXTRA_DIST = \ configure \ + config.h.cmake \ CMakeLists.txt CONFIGURE_DEPENDENCIES = \ Added: vendor/onigmo/config.h.cmake (+1 -0) 100644 =================================================================== --- /dev/null +++ vendor/onigmo/config.h.cmake 2015-05-09 10:51:55 +0900 (2997587) @@ -0,0 +1 @@ +/* dummy */ -------------- next part -------------- HTML����������������������������...Download