Kouhei Sutou
null+****@clear*****
Thu Apr 7 21:53:37 JST 2016
Kouhei Sutou 2016-04-07 21:53:37 +0900 (Thu, 07 Apr 2016) New Revision: 3937f3085c9e90a2b59438a08a5551e5290fe6fd https://github.com/groonga/groonga/commit/3937f3085c9e90a2b59438a08a5551e5290fe6fd Message: cmake: support DLL metadata Modified files: CMakeLists.txt lib/CMakeLists.txt Modified: CMakeLists.txt (+2 -1) =================================================================== --- CMakeLists.txt 2016-04-07 18:14:53 +0900 (8214489) +++ CMakeLists.txt 2016-04-07 21:53:37 +0900 (e01d023) @@ -1,4 +1,4 @@ -# Copyright(C) 2012-2015 Brazil +# Copyright(C) 2012-2016 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -60,6 +60,7 @@ else() endif() endif() string(REGEX REPLACE "(^.*=|\n)" "" GRN_VERSION "${GRN_VERSION}") +string(REGEX REPLACE "\." "," GRN_VERSION_RC "${GRN_VERSION}") include(CheckIncludeFile) include(CheckFunctionExists) Modified: lib/CMakeLists.txt (+14 -1) =================================================================== --- lib/CMakeLists.txt 2016-04-07 18:14:53 +0900 (76251a9) +++ lib/CMakeLists.txt 2016-04-07 21:53:37 +0900 (a564d34) @@ -39,11 +39,23 @@ read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/ts/sources.am LIBGRNTS_SOURCES) string(REGEX REPLACE "([^;]+)" "ts/\\1" LIBGRNTS_SOURCES "${LIBGRNTS_SOURCES}") +if(WIN32) + configure_file( + "metadata.rc.in" + "${CMAKE_CURRENT_BINARY_DIR}/metadata.rc" + @ONLY) + set(LIBGROONGA_METADATA_SOURCES + "${CMAKE_CURRENT_BINARY_DIR}/metadata.rc") +else() + set(LIBGROONGA_METADATA_SOURCES) +endif() + set_source_files_properties( ${LIBGROONGA_SOURCES} ${LIBGRNMRB_SOURCES} ${LIBGRNPROC_SOURCES} ${LIBGRNTS_SOURCES} + ${LIBGROONGA_METADATA_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS}") set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} @@ -55,7 +67,8 @@ set(GRN_ALL_SOURCES ${LIBGRNDAT_SOURCES} ${LIBGRNMRB_SOURCES} ${LIBGRNPROC_SOURCES} - ${LIBGRNTS_SOURCES}) + ${LIBGRNTS_SOURCES} + ${LIBGROONGA_METADATA_SOURCES}) if(GRN_EMBED) add_library(libgroonga STATIC ${GRN_ALL_SOURCES}) set_target_properties( -------------- next part -------------- HTML����������������������������...다운로드
