Kouhei Sutou
null+****@clear*****
Fri Sep 23 01:17:09 JST 2016
Kouhei Sutou 2016-09-23 01:17:09 +0900 (Fri, 23 Sep 2016) New Revision: aa1ccaddc86a89727d319d99d886289aeb20bf87 https://github.com/groonga/groonga/commit/aa1ccaddc86a89727d319d99d886289aeb20bf87 Message: cmake windows: fix a bug that CPP definitions for mruby isn't passed correctly Modified files: vendor/mruby/CMakeLists.txt Modified: vendor/mruby/CMakeLists.txt (+4 -6) =================================================================== --- vendor/mruby/CMakeLists.txt 2016-09-22 23:47:30 +0900 (21f5c4e) +++ vendor/mruby/CMakeLists.txt 2016-09-23 01:17:09 +0900 (ae38a31) @@ -87,15 +87,13 @@ if(GRN_WITH_MRUBY) "${MRUBY_C_COMPILE_FLAGS} -Wno-bad-function-cast") endif() if(WIN32) - set(MRUBY_DEFINITIONS_WIN32 - "MRB_BUILD_AS_DLL MRB_CORE") - else() - set(MRUBY_DEFINITIONS_WIN32 "") + set(MRUBY_DEFINITIONS ${MRUBY_DEFINITIONS} MRB_BUILD_AS_DLL MRB_CORE) endif() set_source_files_properties(${MRUBY_ALL_SOURCES} PROPERTIES - COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}" - COMPILE_DEFINITIONS "${MRUBY_DEFINITIONS} ${MRUBY_DEFINITIONS_WIN32}") + COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}") + set_property(SOURCE ${MRUBY_ALL_SOURCES} + PROPERTY COMPILE_DEFINITIONS ${MRUBY_DEFINITIONS}) install(FILES "${MRUBY_LEGAL_FILE}" -------------- next part -------------- HTML����������������������������...Download