Kouhei Sutou
null+****@clear*****
Fri May 13 18:27:34 JST 2016
Kouhei Sutou 2016-05-13 18:27:34 +0900 (Fri, 13 May 2016) New Revision: e6a2dcb37c6d3b3a1e5b99596a2ad648707422ec https://github.com/groonga/groonga/commit/e6a2dcb37c6d3b3a1e5b99596a2ad648707422ec Message: cmake mruby: use COMPILE_DEFINITIONS Modified files: CMakeLists.txt vendor/mruby/CMakeLists.txt Modified: CMakeLists.txt (+1 -1) =================================================================== --- CMakeLists.txt 2016-05-13 18:12:05 +0900 (9a6f912) +++ CMakeLists.txt 2016-05-13 18:27:34 +0900 (3b5652e) @@ -600,7 +600,7 @@ else() set(MRUBY_INCLUDE_DIRS "") set(MRUBY_LIBS "") endif() -set(MRUBY_DEFINITIONS "-DMRB_INT64") +set(MRUBY_DEFINITIONS "MRB_INT64") # TODO: Support using system Onigmo instead of bundled Onigmo. set(GRN_WITH_ONIGMO ON) Modified: vendor/mruby/CMakeLists.txt (+6 -8) =================================================================== --- vendor/mruby/CMakeLists.txt 2016-05-13 18:12:05 +0900 (601464f) +++ vendor/mruby/CMakeLists.txt 2016-05-13 18:27:34 +0900 (21f5c4e) @@ -86,18 +86,16 @@ if(GRN_WITH_MRUBY) set(MRUBY_C_COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS} -Wno-bad-function-cast") endif() - add_definitions( - ${MRUBY_DEFINITIONS} - ) if(WIN32) - add_definitions( - "-DMRB_BUILD_AS_DLL" - "-DMRB_CORE" - ) + set(MRUBY_DEFINITIONS_WIN32 + "MRB_BUILD_AS_DLL MRB_CORE") + else() + set(MRUBY_DEFINITIONS_WIN32 "") endif() set_source_files_properties(${MRUBY_ALL_SOURCES} PROPERTIES - COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}") + COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}" + COMPILE_DEFINITIONS "${MRUBY_DEFINITIONS} ${MRUBY_DEFINITIONS_WIN32}") install(FILES "${MRUBY_LEGAL_FILE}" -------------- next part -------------- HTML����������������������������...下載
