diff options
Diffstat (limited to 'storage/rocksdb/CMakeLists.txt')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 7382df8ecf7..2ba887b3fae 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -189,26 +189,6 @@ endif() TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib) -IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - - # MARIAROCKS_NOT_YET: Add -frtti flag when compiling RocksDB files. - # TODO: is this the right way to do this? - # - SQL layer and storage/rocksdb/*.cc are compiled with -fnortti - # - RocksDB files are compiled with "-fnortti ... -frtti" - # - This causes RocksDB headers to be compiled with different settings: - # = with RTTI when compiling RocksDB - # = without RTTI when compiling storage/rocksdb/*.cc - # - # (facebook/mysql-5.6 just compiles everything without -f*rtti, which means - # everything is compiled with -frtti) - # - # (also had to add -frtti above, because something that event_listener.cc - # includes requires it. So, now everything in MariaRocks is compiled with - # -frtti) - set_source_files_properties(event_listener.cc rdb_cf_options.cc rdb_sst_info.cc - PROPERTIES COMPILE_FLAGS -frtti) -ENDIF() - CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU) IF(HAVE_SCHED_GETCPU) ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1) @@ -253,9 +233,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myrocks_hotbackup.py ${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup @ONLY) INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup COMPONENT rocksdb-engine) -IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - SET_TARGET_PROPERTIES(rocksdb_tools sst_dump mysql_ldb PROPERTIES COMPILE_FLAGS "-frtti -Wno-error") -ENDIF() IF(MSVC) # RocksDB, the storage engine, overdoes "const" by adding # additional const qualifiers to parameters of the overriden virtual functions @@ -268,6 +245,8 @@ IF(MSVC) IF(CMAKE_SIZEOF_VOID_P EQUAL 8) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") ENDIF() +ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + SET_TARGET_PROPERTIES(rocksdb_tools sst_dump mysql_ldb PROPERTIES COMPILE_FLAGS "-Wno-error") ENDIF() IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/.git) |