Kouhei Sutou
null+****@clear*****
Thu Nov 3 17:31:44 JST 2016
Kouhei Sutou 2016-11-03 17:31:44 +0900 (Thu, 03 Nov 2016) New Revision: dea60e0f77bbc5b4ed4adef175becf0bc894eb8b https://github.com/pgroonga/pgroonga/commit/dea60e0f77bbc5b4ed4adef175becf0bc894eb8b Message: windows: use MessagePack bundled in Groonga Modified files: CMakeLists.txt Modified: CMakeLists.txt (+13 -1) =================================================================== --- CMakeLists.txt 2016-11-03 16:54:26 +0900 (161150a) +++ CMakeLists.txt 2016-11-03 17:31:44 +0900 (8473b62) @@ -40,13 +40,24 @@ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" string(REGEX REPLACE ".*comment = '([^']+)'.*" "\\1" PGRN_DESCRIPTION "${PGRN_CONTROL}") +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/vendor/groonga/bundled_message_pack_version" + PGRN_BUNDLED_MESSAGE_PACK_VERSION) +string(STRIP + "${PGRN_BUNDLED_MESSAGE_PACK_VERSION}" + PGRN_BUNDLED_MESSAGE_PACK_VERSION) +set(PGRN_BUNDLED_MESSAGE_PACK_DIR + "${CMAKE_CURRENT_SOURCE_DIR}/vendor/groonga/vendor/msgpack-${PGRN_BUNDLED_MESSAGE_PACK_VERSION}") + +add_definitions( + -DPGRN_HAVE_MSGPACK) include_directories( "${PGRN_POSTGRESQL_DIR}/include/server/port/win32_msvc" "${PGRN_POSTGRESQL_DIR}/include/server/port/win32" "${PGRN_POSTGRESQL_DIR}/include/server" "${PGRN_POSTGRESQL_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/vendor/groonga/include" - "${CMAKE_CURRENT_SOURCE_DIR}/vendor/xxHash") + "${CMAKE_CURRENT_SOURCE_DIR}/vendor/xxHash" + "${PGRN_BUNDLED_MESSAGE_PACK_DIR}/include") link_directories( "${PGRN_POSTGRESQL_DIR}/lib") @@ -71,6 +82,7 @@ set_target_properties("${PGRN_LIBRARY_NAME}" OUTPUT_NAME "${PGRN_PROJECT_ID}") target_link_libraries("${PGRN_LIBRARY_NAME}" libgroonga + msgpackc "postgres.lib") install(TARGETS "${PGRN_LIBRARY_NAME}" DESTINATION "${PGRN_EXTENSION_DIR}") -------------- next part -------------- HTML����������������������������...Download