Kouhei Sutou
null+****@clear*****
Tue Apr 7 22:16:35 JST 2015
Kouhei Sutou 2015-04-07 22:16:35 +0900 (Tue, 07 Apr 2015) New Revision: 4b6c396207c1ca65bf9f0cc2780dce3dc14f7f86 https://github.com/mroonga/mroonga/commit/4b6c396207c1ca65bf9f0cc2780dce3dc14f7f86 Message: cmake: fix a bug that exception and RTTI are enabled with MariaDB Modified files: CMakeLists.txt Modified: CMakeLists.txt (+3 -2) =================================================================== --- CMakeLists.txt 2015-04-06 12:28:53 +0900 (17ec9f6) +++ CMakeLists.txt 2015-04-07 22:16:35 +0900 (2ed3fbf) @@ -360,8 +360,9 @@ else() mrn_build_flag("-Wno-strict-aliasing") mrn_build_flag("-Wno-deprecated") mrn_check_cxxflag("-fno-implicit-templates") - if("${MYSQL_VARIANT}" STREQUAL "MySQL" AND - ${MYSQL_VERSION} VERSION_LESS "5.7.0") + if(("${MYSQL_VARIANT}" STREQUAL "MariaDB") OR + ("${MYSQL_VARIANT}" STREQUAL "MySQL" AND + ${MYSQL_VERSION} VERSION_LESS "5.7.0")) mrn_check_cxxflag("-fno-exceptions") mrn_check_cxxflag("-fno-rtti") endif() -------------- next part -------------- HTML����������������������������...Download