Kouhei Sutou
null+****@clear*****
Sat Oct 25 19:17:22 JST 2014
Kouhei Sutou 2014-10-25 19:17:22 +0900 (Sat, 25 Oct 2014) New Revision: 7f9e76ec7c6ffa4b85a27652fb335b6017111dcd https://github.com/mroonga/mroonga/commit/7f9e76ec7c6ffa4b85a27652fb335b6017111dcd Message: mysql57: add new include directory Mroonga can't be built with MySQL 5.7 yet. MySQL 5.7 has many API changes... :< Modified files: CMakeLists.txt Modified: CMakeLists.txt (+7 -0) =================================================================== --- CMakeLists.txt 2014-10-25 19:09:20 +0900 (2907fe6) +++ CMakeLists.txt 2014-10-25 19:17:22 +0900 (e480781) @@ -152,11 +152,18 @@ else() set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/regex") endif() +if(EXISTS "${MYSQL_SOURCE_DIR}/extra/rapidjson") + set(MYSQL_RAPIDJSON_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/extra/rapidjson/include") +else() + set(MYSQL_RAPIDJSON_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_SOURCE_DIR}") if(MRN_BUNDLED) -------------- next part -------------- HTML����������������������������...Download