Kouhei Sutou
null+****@clear*****
Tue May 7 18:19:37 JST 2013
Kouhei Sutou 2013-05-07 18:19:37 +0900 (Tue, 07 May 2013) New Revision: 2dbde7fe7ed124bca02e9d556d501f1efd3dc0b5 https://github.com/mroonga/mroonga/commit/2dbde7fe7ed124bca02e9d556d501f1efd3dc0b5 Message: cmake: use clear variable name The variable has a directory path for libmysqlservices.a. Modified files: CMakeLists.txt Modified: CMakeLists.txt (+3 -3) =================================================================== --- CMakeLists.txt 2013-05-07 18:07:39 +0900 (db5d0e8) +++ CMakeLists.txt 2013-05-07 18:19:37 +0900 (1fac76e) @@ -106,7 +106,7 @@ set(MYSQL_INCLUDE_DIRS if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") - set(MYSQL_PKG_LIB_DIR "${INSTALL_LIBDIR}") + set(MYSQL_SERVICES_LIB_DIR "${MYSQL_BUILD_DIR}/libservices") set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") set(MYSQL_VERSION "${MYSQL_BASE_VERSION}") else() @@ -120,6 +120,7 @@ else() set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR) set_mysql_config_value("--variable=pkglibdir" MYSQL_PKG_LIB_DIR) + set(MYSQL_SERVICES_LIB_DIR, "${MYSQL_PKG_LIB_DIR}") set_mysql_config_value("--cflags" MYSQL_CFLAGS) set_mysql_config_value("--version" MYSQL_VERSION) endif() @@ -152,8 +153,7 @@ if(WIN32) "${MYSQL_BUILD_DIR}/libmysqld") else() set(MYSQL_LIBRARY_DIRS - "${MYSQL_BUILD_DIR}/libservices" - "${MYSQL_PKG_LIB_DIR}") + "${MYSQL_SERVICES_LIB_DIR}") endif() link_directories( ${GROONGA_LIBRARY_DIRS} -------------- next part -------------- HTML����������������������������...Download