diff options
Diffstat (limited to 'storage/tokudb/CMakeLists.txt')
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 08adb7355e4..7cbc8a119e4 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -17,16 +17,12 @@ IF(NOT LIBJEMALLOC) MESSAGE(WARNING "TokuDB is enabled, but jemalloc is not. This configuration is not supported") ENDIF() -IF (HAVE_WVLA) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-vla") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wno-vla") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-vla") -ENDIF() +MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla") +MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) ############################################ -SET(TOKUDB_VERSION "tokudb-7.5.6") SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.1/README-TOKUDB\nusr/share/doc/mariadb-server-10.1/README.md" PARENT_SCOPE) +SET(TOKUDB_VERSION "tokudb-7.5.7") SET(USE_BDB OFF CACHE BOOL "") MARK_AS_ADVANCED(BUILDNAME) MARK_AS_ADVANCED(BUILD_TESTING) @@ -70,36 +66,7 @@ ENDIF() include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -macro(set_cflags_if_supported) - foreach(flag ${ARGN}) - string(REGEX REPLACE "-" "_" temp_flag ${flag}) - check_c_compiler_flag(${flag} HAVE_C_${temp_flag}) - if (HAVE_C_${temp_flag}) - set(CMAKE_C_FLAGS "${flag} ${CMAKE_C_FLAGS}") - endif () - check_cxx_compiler_flag(${flag} HAVE_CXX_${temp_flag}) - if (HAVE_CXX_${temp_flag}) - set(CMAKE_CXX_FLAGS "${flag} ${CMAKE_CXX_FLAGS}") - endif () - endforeach(flag) -endmacro(set_cflags_if_supported) - -macro(append_cflags_if_supported) - foreach(flag ${ARGN}) - string(REGEX REPLACE "-" "_" temp_flag ${flag}) - check_c_compiler_flag(${flag} HAVE_C_${temp_flag}) - if (HAVE_C_${temp_flag}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") - endif () - check_cxx_compiler_flag(${flag} HAVE_CXX_${temp_flag}) - if (HAVE_CXX_${temp_flag}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") - endif () - endforeach(flag) -endmacro(append_cflags_if_supported) - -set_cflags_if_supported(-Wno-missing-field-initializers) -append_cflags_if_supported(-Wno-vla) +MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-missing-field-initializers) ADD_SUBDIRECTORY(ft-index) |