Kouhei Sutou
null+****@clear*****
Wed Sep 21 17:15:56 JST 2016
Kouhei Sutou 2016-09-21 17:15:56 +0900 (Wed, 21 Sep 2016) New Revision: a3d2acd317051213bae7e98b02027d02c2a922c8 https://github.com/pgroonga/pgroonga/commit/a3d2acd317051213bae7e98b02027d02c2a922c8 Message: Share source list in both Makefile.am and CMakeLists.txt Added files: sources.am Modified files: CMakeLists.txt Makefile Modified: CMakeLists.txt (+6 -18) =================================================================== --- CMakeLists.txt 2016-09-21 17:14:42 +0900 (c2f20c9) +++ CMakeLists.txt 2016-09-21 17:15:56 +0900 (161150a) @@ -54,26 +54,14 @@ configure_file( "src/pgroonga.rc.in" "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga.rc" @ONLY) +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/sources.am PGRN_SOURCES) +string(REGEX REPLACE "^.*=[ \t]*\\\\" "" + PGRN_SOURCES "${PGRN_SOURCES}") +string(REGEX REPLACE "[ \t\n]" "" PGRN_SOURCES "${PGRN_SOURCES}") +string(REGEX REPLACE "\\\\" ";" PGRN_SOURCES "${PGRN_SOURCES}") set(PGRN_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga.rc" - "src/pgroonga.c" - "src/pgrn_column_name.c" - "src/pgrn_convert.c" - "src/pgrn_create.c" - "src/pgrn_flush.c" - "src/pgrn_global.c" - "src/pgrn_groonga.c" - "src/pgrn_highlight_html.c" - "src/pgrn_keywords.c" - "src/pgrn_jsonb.c" - "src/pgrn_match_positions_byte.c" - "src/pgrn_match_positions_character.c" - "src/pgrn_options.c" - "src/pgrn_query_extract_keywords.c" - "src/pgrn_snippet_html.c" - "src/pgrn_value.c" - "src/pgrn_variables.c" - "vendor/xxHash/xxhash.c") + ${PGRN_SOURCES}) set_source_files_properties(${PGRN_SOURCES} PROPERTIES COMPILE_FLAGS "/EHsc") Modified: Makefile (+1 -19) =================================================================== --- Makefile 2016-09-21 17:14:42 +0900 (1e942b8) +++ Makefile 2016-09-21 17:15:56 +0900 (fba31b6) @@ -2,25 +2,7 @@ REQUIRED_GROONGA_VERSION = 5.1.2 GROONGA_PKG = "groonga >= $(REQUIRED_GROONGA_VERSION)" MODULE_big = pgroonga -SRCS = \ - src/pgroonga.c \ - src/pgrn_column_name.c \ - src/pgrn_convert.c \ - src/pgrn_create.c \ - src/pgrn_flush.c \ - src/pgrn_global.c \ - src/pgrn_groonga.c \ - src/pgrn_highlight_html.c \ - src/pgrn_keywords.c \ - src/pgrn_jsonb.c \ - src/pgrn_match_positions_byte.c \ - src/pgrn_match_positions_character.c \ - src/pgrn_options.c \ - src/pgrn_query_extract_keywords.c \ - src/pgrn_snippet_html.c \ - src/pgrn_value.c \ - src/pgrn_variables.c \ - vendor/xxHash/xxhash.c +include sources.am OBJS = $(SRCS:.c=.o) EXTENSION = pgroonga EXTENSION_VERSION = \ Added: sources.am (+19 -0) 100644 =================================================================== --- /dev/null +++ sources.am 2016-09-21 17:15:56 +0900 (820c22b) @@ -0,0 +1,19 @@ +SRCS = \ + src/pgroonga.c \ + src/pgrn_column_name.c \ + src/pgrn_convert.c \ + src/pgrn_create.c \ + src/pgrn_flush.c \ + src/pgrn_global.c \ + src/pgrn_groonga.c \ + src/pgrn_highlight_html.c \ + src/pgrn_keywords.c \ + src/pgrn_jsonb.c \ + src/pgrn_match_positions_byte.c \ + src/pgrn_match_positions_character.c \ + src/pgrn_options.c \ + src/pgrn_query_extract_keywords.c \ + src/pgrn_snippet_html.c \ + src/pgrn_value.c \ + src/pgrn_variables.c \ + vendor/xxHash/xxhash.c -------------- next part -------------- HTML����������������������������...Download