Kouhei Sutou
null+****@clear*****
Thu Oct 12 23:14:34 JST 2017
Kouhei Sutou 2017-10-12 23:14:34 +0900 (Thu, 12 Oct 2017) New Revision: dd156c48d00c8d9a78117a370b3e592822c2b95b https://github.com/groonga/groonga/commit/dd156c48d00c8d9a78117a370b3e592822c2b95b Message: cmake: don't specify C flags such as -std=gnu99 to .cpp files Added files: lib/cpp_sources.am Modified files: lib/CMakeLists.txt lib/Makefile.am Renamed files: lib/c_sources.am (from lib/sources.am) Modified: lib/CMakeLists.txt (+10 -5) =================================================================== --- lib/CMakeLists.txt 2017-10-12 18:26:27 +0900 (281bc95a0) +++ lib/CMakeLists.txt 2017-10-12 23:14:34 +0900 (a90cea004) @@ -25,7 +25,8 @@ include_directories( ${LIBZSTD_INCLUDE_DIRS} ${MESSAGE_PACK_INCLUDE_DIRS}) -read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am LIBGROONGA_SOURCES) +read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/c_sources.am LIBGROONGA_C_SOURCES) +read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/cpp_sources.am LIBGROONGA_CPP_SOURCES) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/dat/sources.am LIBGRNDAT_SOURCES) string(REGEX REPLACE "([^;]+)" "dat/\\1" LIBGRNDAT_SOURCES "${LIBGRNDAT_SOURCES}") @@ -51,23 +52,27 @@ else() endif() set_source_files_properties( - ${LIBGROONGA_SOURCES} + ${LIBGROONGA_C_SOURCES} ${LIBGRNMRB_SOURCES} ${LIBGRNPROC_SOURCES} ${LIBGRNTS_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_source_files_properties( - ${LIBGROONGA_SOURCES} + ${LIBGROONGA_C_SOURCES} + ${LIBGROONGA_CPP_SOURCES} ${LIBGRNMRB_SOURCES} PROPERTIES COMPILE_DEFINITIONS "${MRUBY_DEFINITIONS}") -set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} +set_source_files_properties( + ${LIBGROONGA_CPP_SOURCES} + ${LIBGRNDAT_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS}") set(GRN_ALL_SOURCES - ${LIBGROONGA_SOURCES} + ${LIBGROONGA_C_SOURCES} + ${LIBGROONGA_CPP_SOURCES} ${LIBGRNDAT_SOURCES} ${LIBGRNMRB_SOURCES} ${LIBGRNPROC_SOURCES} Modified: lib/Makefile.am (+5 -1) =================================================================== --- lib/Makefile.am 2017-10-12 18:26:27 +0900 (7a7281ea8) +++ lib/Makefile.am 2017-10-12 23:14:34 +0900 (f2ba81fee) @@ -36,7 +36,11 @@ DEFAULT_INCLUDES = \ DEFS += -D_REENTRANT $(GRN_DEFS) -DGRN_DAT_EXPORT -include sources.am +include c_sources.am +include cpp_sources.am +libgroonga_la_SOURCES = \ + $(libgroonga_c_sources) \ + $(libgroonga_cpp_sources) #nfkc.c: # $(RUBY) nfkc.rb --impl=table Renamed: lib/c_sources.am (+1 -3) 97% =================================================================== --- lib/sources.am 2017-10-12 18:26:27 +0900 (268bf67d8) +++ lib/c_sources.am 2017-10-12 23:14:34 +0900 (3b76e6930) @@ -1,7 +1,6 @@ -libgroonga_la_SOURCES = \ +libgroonga_c_sources = \ alloc.c \ grn_alloc.h \ - arrow.cpp \ cache.c \ grn_cache.h \ column.c \ @@ -15,7 +14,6 @@ libgroonga_la_SOURCES = \ grn_ctx_impl.h \ ctx_impl_mrb.c \ grn_ctx_impl_mrb.h \ - dat.cpp \ grn_dat.h \ db.c \ grn_db.h \ Added: lib/cpp_sources.am (+3 -0) 100644 =================================================================== --- /dev/null +++ lib/cpp_sources.am 2017-10-12 23:14:34 +0900 (bf829291c) @@ -0,0 +1,3 @@ +libgrnarrow_cpp_source = \ + arrow.cpp \ + dat.cpp -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171012/fba2aa86/attachment-0001.htm
