Kouhei Sutou
null+****@clear*****
Thu May 9 18:20:29 JST 2013
Kouhei Sutou 2013-05-09 18:20:29 +0900 (Thu, 09 May 2013) New Revision: ff2f7f35f7d8ac8ac722cbf65d58e1313c345dc5 https://github.com/groonga/groonga/commit/ff2f7f35f7d8ac8ac722cbf65d58e1313c345dc5 Message: cmake: suppress warnings Modified files: CMakeLists.txt lib/CMakeLists.txt plugins/query_expanders/CMakeLists.txt plugins/suggest/CMakeLists.txt plugins/table/CMakeLists.txt plugins/tokenizers/CMakeLists.txt src/CMakeLists.txt Modified: CMakeLists.txt (+9 -0) =================================================================== --- CMakeLists.txt 2013-05-09 16:44:15 +0900 (40b6e45) +++ CMakeLists.txt 2013-05-09 18:20:29 +0900 (8c50f97) @@ -80,6 +80,15 @@ set(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE "synonyms.tsv") set(GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE "${GRN_DATA_DIR}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE}") +if(CMAKE_COMPILER_IS_GNUCXX) + set(GRN_NO_WARNING_COMPILE_FLAGS + "${GRN_NO_WARNING_COMPILE_FLAGS} -Wno-unused-but-set-variable") + set(GRN_NO_WARNING_COMPILE_FLAGS + "${GRN_NO_WARNING_COMPILE_FLAGS} -Wno-sign-compare") + set(GRN_C_COMPILE_FLAGS "${GRN_NO_WARNING_COMPILE_FLAGS} -Wno-pointer-sign") + set(GRN_CXX_COMPILE_FLAGS "${GRN_NO_WARNING_COMPILE_FLAGS} -fexceptions") +endif() + add_definitions( -DHAVE_CONFIG_H ) Modified: lib/CMakeLists.txt (+6 -4) =================================================================== --- lib/CMakeLists.txt 2013-05-09 16:44:15 +0900 (83bfef3) +++ lib/CMakeLists.txt 2013-05-09 18:20:29 +0900 (6d3fb01) @@ -26,10 +26,12 @@ read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/dat/sources.am LIBGRNDAT_SOURCES) string(REGEX REPLACE "([^;]+)" "dat/\\1" LIBGRNDAT_SOURCES "${LIBGRNDAT_SOURCES}") -if(CMAKE_COMPILER_IS_GNUCXX) - set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} PROPERTIES - COMPILE_FLAGS "-fexceptions") -endif() +set_source_files_properties(${LIBGROONGA_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") +set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS}") add_library(libgroonga SHARED ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga") Modified: plugins/query_expanders/CMakeLists.txt (+3 -0) =================================================================== --- plugins/query_expanders/CMakeLists.txt 2013-05-09 16:44:15 +0900 (71aac68) +++ plugins/query_expanders/CMakeLists.txt 2013-05-09 18:20:29 +0900 (2e4db24) @@ -19,6 +19,9 @@ include_directories( set(QUERY_EXPANDERS_DIR "${GRN_PLUGINS_DIR}/query_expanders") read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/tsv_sources.am TSV_SOURCES) +set_source_files_properties(${TSV_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") add_library(tsv_query_expander MODULE ${TSV_SOURCES}) set_target_properties(tsv_query_expander PROPERTIES PREFIX "" Modified: plugins/suggest/CMakeLists.txt (+3 -0) =================================================================== --- plugins/suggest/CMakeLists.txt 2013-05-09 16:44:15 +0900 (05002c6) +++ plugins/suggest/CMakeLists.txt 2013-05-09 18:20:29 +0900 (cadf185) @@ -19,6 +19,9 @@ include_directories( read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am SUGGEST_SOURCES) add_library(suggest MODULE ${SUGGEST_SOURCES}) +set_source_files_properties(${SUGGEST_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(suggest PROPERTIES PREFIX "") target_link_libraries(suggest libgroonga) install(TARGETS suggest DESTINATION "${GRN_PLUGINS_DIR}/suggest") Modified: plugins/table/CMakeLists.txt (+3 -0) =================================================================== --- plugins/table/CMakeLists.txt 2013-05-09 16:44:15 +0900 (119a9bd) +++ plugins/table/CMakeLists.txt 2013-05-09 18:20:29 +0900 (bafd572) @@ -19,6 +19,9 @@ include_directories( read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am TABLE_SOURCES) add_library(table MODULE ${TABLE_SOURCES}) +set_source_files_properties(${TABLE_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(table PROPERTIES PREFIX "") target_link_libraries(table libgroonga) install(TARGETS table DESTINATION "${GRN_PLUGINS_DIR}/table") Modified: plugins/tokenizers/CMakeLists.txt (+6 -0) =================================================================== --- plugins/tokenizers/CMakeLists.txt 2013-05-09 16:44:15 +0900 (b5274f8) +++ plugins/tokenizers/CMakeLists.txt 2013-05-09 18:20:29 +0900 (8888354) @@ -23,6 +23,9 @@ if(WITH_MECAB) include_directories(${MECAB_INCLUDE_DIRS}) link_directories(${MECAB_LIBRARY_DIRS}) add_library(mecab_tokenizer MODULE ${MECAB_SOURCES}) + set_source_files_properties(${MECAB_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(mecab_tokenizer PROPERTIES PREFIX "" OUTPUT_NAME "mecab") @@ -35,6 +38,9 @@ if(WITH_KYTEA) include_directories(${KYTEA_INCLUDE_DIRS}) link_directories(${KYTEA_LIBRARY_DIRS}) add_library(kytea_tokenizer MODULE ${KYTEA_SOURCES}) + set_source_files_properties(${KYTEA_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_target_properties(kytea_tokenizer PROPERTIES PREFIX "" OUTPUT_NAME "kytea") Modified: src/CMakeLists.txt (+9 -0) =================================================================== --- src/CMakeLists.txt 2013-05-09 16:44:15 +0900 (be91b73) +++ src/CMakeLists.txt 2013-05-09 18:20:29 +0900 (024bbdd) @@ -17,12 +17,18 @@ add_subdirectory(suggest) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_sources.am GROONGA_SOURCES) add_executable(groonga ${GROONGA_SOURCES}) +set_source_files_properties(${GROONGA_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga libgroonga) install(TARGETS groonga DESTINATION ${BIN_DIR}) if(NOT WIN32) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/grnslap_sources.am GRNSLAP_SOURCES) add_executable(grnslap ${GRNSLAP_SOURCES}) + set_source_files_properties(${GRNSLAP_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(grnslap libgroonga) install(TARGETS grnslap DESTINATION ${BIN_DIR}) endif() @@ -30,6 +36,9 @@ endif() read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_benchmark_sources.am GROONGA_BENCHMARK_SOURCES) add_executable(groonga-benchmark ${GROONGA_BENCHMARK_SOURCES}) +set_source_files_properties(${GROONGA_BENCHMARK_SOURCES} + PROPERTIES + COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") target_link_libraries(groonga-benchmark libgroonga) install(TARGETS groonga-benchmark DESTINATION ${BIN_DIR}) -------------- next part -------------- HTML����������������������������...Download