Kouhei Sutou
null+****@clear*****
Sat Oct 17 16:43:12 JST 2015
Kouhei Sutou 2015-10-17 16:43:12 +0900 (Sat, 17 Oct 2015) New Revision: 40f20eec93ea6c3adf10887b44bc98538d3a2401 https://github.com/groonga/groonga/commit/40f20eec93ea6c3adf10887b44bc98538d3a2401 Message: cmake mruby: disable some warnings Modified files: CMakeLists.txt vendor/mruby/CMakeLists.txt Modified: CMakeLists.txt (+0 -1) =================================================================== --- CMakeLists.txt 2015-10-17 16:19:29 +0900 (5403dde) +++ CMakeLists.txt 2015-10-17 16:43:12 +0900 (e362ba1) @@ -182,7 +182,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX) check_build_flag("-Wdisabled-optimization") check_build_flag("-Wfloat-equal") check_build_flag("-Wpointer-arith") - check_cflag("-Wdeclaration-after-statement") check_cflag("-Wbad-function-cast") if(NOT CMAKE_COMPILER_IS_CLANGCXX) check_build_flag("-Wcast-align") Modified: vendor/mruby/CMakeLists.txt (+11 -3) =================================================================== --- vendor/mruby/CMakeLists.txt 2015-10-17 16:19:29 +0900 (f2b27af) +++ vendor/mruby/CMakeLists.txt 2015-10-17 16:43:12 +0900 (55a2eaa) @@ -67,11 +67,19 @@ if(GRN_WITH_MRUBY) ${MRUBY_BUILT_SOURCES} ) add_library(mruby STATIC ${MRUBY_ALL_SOURCES}) - set_source_files_properties(${MRUBY_ALL_SOURCES} - PROPERTIES - COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties( mruby PROPERTIES POSITION_INDEPENDENT_CODE ON) + + set(MRUBY_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANGCC) + set(MRUBY_C_COMPILE_FLAGS + "${MRUBY_C_COMPILE_FLAGS} -Wno-float-equal") + set(MRUBY_C_COMPILE_FLAGS + "${MRUBY_C_COMPILE_FLAGS} -Wno-bad-function-cast") + endif() + set_source_files_properties(${MRUBY_ALL_SOURCES} + PROPERTIES + COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}") endif() -------------- next part -------------- HTML����������������������������...Download