Kouhei Sutou
null+****@clear*****
Tue May 7 18:07:39 JST 2013
Kouhei Sutou 2013-05-07 18:07:39 +0900 (Tue, 07 May 2013) New Revision: 4fd7fe72151c7c0a26f6459b33ef460dc0816ef2 https://github.com/mroonga/mroonga/commit/4fd7fe72151c7c0a26f6459b33ef460dc0816ef2 Message: cmake: don't use relative path Modified files: CMakeLists.txt Modified: CMakeLists.txt (+3 -1) =================================================================== --- CMakeLists.txt 2013-05-07 16:54:11 +0900 (19db29e) +++ CMakeLists.txt 2013-05-07 18:07:39 +0900 (db5d0e8) @@ -106,6 +106,7 @@ set(MYSQL_INCLUDE_DIRS if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") + set(MYSQL_PKG_LIB_DIR "${INSTALL_LIBDIR}") set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") set(MYSQL_VERSION "${MYSQL_BASE_VERSION}") else() @@ -118,6 +119,7 @@ else() endmacro() set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR) + set_mysql_config_value("--variable=pkglibdir" MYSQL_PKG_LIB_DIR) set_mysql_config_value("--cflags" MYSQL_CFLAGS) set_mysql_config_value("--version" MYSQL_VERSION) endif() @@ -151,7 +153,7 @@ if(WIN32) else() set(MYSQL_LIBRARY_DIRS "${MYSQL_BUILD_DIR}/libservices" - "${MYSQL_PLUGIN_DIR}/..") + "${MYSQL_PKG_LIB_DIR}") endif() link_directories( ${GROONGA_LIBRARY_DIRS} -------------- next part -------------- HTML����������������������������...Download