From 2400e06946bb5856684fd27ee86f610267bf4dc3 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 9 May 2019 19:12:34 +0200
Subject: remove -fno-rtti

---
 storage/oqgraph/CMakeLists.txt | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'storage/oqgraph')

diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index 638ac00dc01..6199a648c2c 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-FUNCTION(CHECK_OQGRAPH)
+MACRO(CHECK_OQGRAPH)
 MESSAGE(STATUS "Configuring OQGraph")
 FIND_PACKAGE(Boost 1.40.0)
 IF(NOT Boost_FOUND)
@@ -17,27 +17,8 @@ IF(NOT Judy_FOUND)
   RETURN()
 ENDIF()
 INCLUDE_DIRECTORIES(${Judy_INCLUDE_DIR})
-
-IF(MSVC)
-#  # lp:756966 OQGRAPH on Win64 does not compile
-#  IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
-#    SET(OQGRAPH_OK 0 CACHE INTERNAL "")
-#  ELSE()
-    SET(OQGRAPH_OK 1 CACHE INTERNAL "")
-#  ENDIF()
-ELSE()
-# See if that works. On old gcc it'll fail because of -fno-rtti
-SET(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
-CHECK_CXX_SOURCE_COMPILES(
-"
-#define BOOST_NO_RTTI 1
-#define BOOST_NO_TYPEID 1
-#include <boost/config.hpp>
-#include <boost/property_map/property_map.hpp>
-int main() { return 0; }
-" OQGRAPH_OK)
-ENDIF()
-ENDFUNCTION()
+SET(OQGRAPH_OK 1)
+ENDMACRO()
 
 IF(NOT DEFINED OQGRAPH_OK)
   CHECK_OQGRAPH()
-- 
cgit v1.2.1