Kouhei Sutou
null+****@clear*****
Mon Apr 27 23:17:35 JST 2015
Kouhei Sutou 2015-04-27 23:17:35 +0900 (Mon, 27 Apr 2015) New Revision: 80f7b6e47830f6f449aa6ca9c2a5341b685d3f20 https://github.com/pgroonga/pgroonga/commit/80f7b6e47830f6f449aa6ca9c2a5341b685d3f20 Message: windows: use CMAKE_INSTALL_PREFIX as PostgreSQL directory Modified files: CMakeLists.txt Modified: CMakeLists.txt (+6 -7) =================================================================== --- CMakeLists.txt 2015-04-27 23:11:43 +0900 (0a0b7e0) +++ CMakeLists.txt 2015-04-27 23:17:35 +0900 (e551232) @@ -13,8 +13,7 @@ endif() add_subdirectory(vendor/groonga) -set(POSTGRESQL_BINARY_DIR "/PATH/TO/POSTGRESQL/BINARY/DIRECTORY" - CACHE PATH "PostgreSQL binary directory") +set(PGRN_POSTGRESQL_DIR "${CMAKE_INSTALL_PREFIX}") set(PGRN_EXTENSION_DIR "lib") set(PGRN_EXTENSION_DATA_DIR "share/extension") @@ -26,13 +25,13 @@ string(REGEX REPLACE "^default_version = '([0-9.]+)'.*" "\\1" PGRN_VERSION "${PGRN_CONTROL}") include_directories( - "${POSTGRESQL_BINARY_DIR}/include/server/port/win32_msvc" - "${POSTGRESQL_BINARY_DIR}/include/server/port/win32" - "${POSTGRESQL_BINARY_DIR}/include/server" - "${POSTGRESQL_BINARY_DIR}/include" + "${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") link_directories( - "${POSTGRESQL_BINARY_DIR}/lib") + "${PGRN_POSTGRESQL_DIR}/lib") set(PGRN_SOURCES "pgroonga.c") -------------- next part -------------- HTML����������������������������...Download