1 files changed, 5 insertions, 5 deletions
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index 01723f04e16..31016ba47b8 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -11,10 +11,10 @@ IF(BOOST_OK)
   IF(MSVC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
   ENDIF(MSVC)
+  IF(CMAKE_CXX_FLAGS)
+    STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+  ENDIF()
 
-  SET(OQGRAPH_PLUGIN_STATIC  "oqgraph")
-  SET(OQGRAPH_PLUGIN_DYNAMIC "ha_oqgraph")
-  SET(OQGRAPH_SOURCES ha_oqgraph.cc graphcore.cc)
-  MYSQL_ADD_PLUGIN(oqgraph ${OQGRAPH_SOURCES} STORAGE_ENGINE)
+  MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE)
 ENDIF(BOOST_OK)
-#error same fix here as in plugin.m4