Kouhei Sutou
null+****@clear*****
Mon Apr 8 11:03:35 JST 2013
Kouhei Sutou 2013-04-08 11:03:35 +0900 (Mon, 08 Apr 2013) New Revision: 1076e8dab72856ac9f28c717af1abe67c139c171 https://github.com/mroonga/mroonga/commit/1076e8dab72856ac9f28c717af1abe67c139c171 Message: cmake: extract common code Modified files: CMakeLists.txt Modified: CMakeLists.txt (+8 -13) =================================================================== --- CMakeLists.txt 2013-04-08 11:02:35 +0900 (f5f5eef) +++ CMakeLists.txt 2013-04-08 11:03:35 +0900 (f4c891a) @@ -63,27 +63,22 @@ string(REGEX REPLACE "([^;]+)" "${LIBMRN_DIR_PREFIX}lib/\\1" if(MRN_BUNDLED) set(MYSQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}) set(MYSQL_BUILD_DIR ${MYSQL_SOURCE_DIR}) - set(MYSQL_INCLUDE_DIRS - "${MYSQL_BUILD_DIR}/include" - "${MYSQL_SOURCE_DIR}/sql" - "${MYSQL_SOURCE_DIR}/include" - "${MYSQL_SOURCE_DIR}/regex" - "${MYSQL_SOURCE_DIR}") set(MYSQL_CONFIG ${CMAKE_SOURCE_DIR}/scripts/mysql_config) else() set(MYSQL_SOURCE_DIR "PATH" CACHE PATH "MySQL source directory") set(MYSQL_BUILD_DIR ${MYSQL_SOURCE_DIR} CACHE PATH "MySQL build directory") - set(MYSQL_INCLUDE_DIRS - "${MYSQL_BUILD_DIR}/include" - "${MYSQL_SOURCE_DIR}/sql" - "${MYSQL_SOURCE_DIR}/include" - "${MYSQL_SOURCE_DIR}/regex" - "${MYSQL_SOURCE_DIR}" - CACHE INTERNAL "MySQL include directories") set(MYSQL_CONFIG "mysql_config" CACHE PATH "mysql-config command path") endif() find_path(MYSQL_CONFIG "${MYSQL_CONFIG}") +set(MYSQL_INCLUDE_DIRS + "${MYSQL_BUILD_DIR}/include" + "${MYSQL_SOURCE_DIR}/sql" + "${MYSQL_SOURCE_DIR}/include" + "${MYSQL_SOURCE_DIR}/regex" + "${MYSQL_SOURCE_DIR}" + CACHE INTERNAL "MySQL include directories") + if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") -------------- next part -------------- HTML����������������������������...Download