diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-05-09 19:12:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-18 20:34:03 +0200 |
| commit | 2400e06946bb5856684fd27ee86f610267bf4dc3 (patch) | |
| tree | d27f225a2e102674c5b3cc4487a6f861154c4ca8 /storage/oqgraph | |
| parent | 2c08436959dc0b0a6a4a58f18114dd9987151396 (diff) | |
| download | mariadb-git-2400e06946bb5856684fd27ee86f610267bf4dc3.tar.gz | |
remove -fno-rtti
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 25 |
1 files changed, 3 insertions, 22 deletions
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() |