Kouhei Sutou
null+****@clear*****
Thu Mar 12 23:41:12 JST 2015
Kouhei Sutou 2015-03-12 23:41:12 +0900 (Thu, 12 Mar 2015) New Revision: 4af011f856dca07b7fc4e33c489150a3e573001a https://github.com/mroonga/mroonga/commit/4af011f856dca07b7fc4e33c489150a3e573001a Message: mysql57: add include paths to libbinlogevents Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+12 -0) =================================================================== --- CMakeLists.txt 2015-03-10 14:38:47 +0900 (b24bf09) +++ CMakeLists.txt 2015-03-12 23:41:12 +0900 (d938d79) @@ -198,12 +198,24 @@ else() set(MYSQL_RAPIDJSON_INCLUDE_DIR) endif() +if(EXISTS "${MYSQL_SOURCE_DIR}/libbinlogevents") + set(MYSQL_LIBBINLOGEVENTS_EXPORT_DIR + "${MYSQL_SOURCE_DIR}/libbinlogevents/export") + set(MYSQL_LIBBINLOGEVENTS_INCLUDE_DIR + "${MYSQL_SOURCE_DIR}/libbinlogevents/include") +else() + set(MYSQL_LIBBINLOGEVENTS_EXPORT_DIR) + set(MYSQL_LIBBINLOGEVENTS_INCLUDE_DIR) +endif() + set(MYSQL_INCLUDE_DIRS "${MYSQL_BUILD_DIR}/include" "${MYSQL_SOURCE_DIR}/sql" "${MYSQL_SOURCE_DIR}/include" "${MYSQL_REGEX_INCLUDE_DIR}" "${MYSQL_RAPIDJSON_INCLUDE_DIR}" + "${MYSQL_LIBBINLOGEVENTS_EXPORT_DIR}" + "${MYSQL_LIBBINLOGEVENTS_INCLUDE_DIR}" "${MYSQL_SOURCE_DIR}") if(MRN_BUNDLED) Modified: configure.ac (+4 -0) =================================================================== --- configure.ac 2015-03-10 14:38:47 +0900 (6d8fa0f) +++ configure.ac 2015-03-12 23:41:12 +0900 (8fbbd55) @@ -184,6 +184,10 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ mysql_regex_include_dir="$ac_mysql_source_dir/regex" fi MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_regex_include_dir" + if test -d "$ac_mysql_source_dir/libbinlogevents"; then + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/libbinlogevents/export" + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/libbinlogevents/include" + fi MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir" MYSQL_INCLUDES="$MYSQL_INCLUDES $($ac_mysql_config --include)" AC_SUBST(MYSQL_INCLUDES) -------------- next part -------------- HTML����������������������������...Download