mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Tokutek/ft-index

Browse source
This commit is contained in:
Rich Prohaska 2013-05-03 09:01:15 -04:00
commit 550d331f36
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake_modules/TokuFeatureDetection.cmake
View file

@ -74,6 +74,8 @@ check_function_exists(nrand48 HAVE_NRAND48)
check_function_exists(random_r HAVE_RANDOM_R) check_function_exists(random_r HAVE_RANDOM_R)
check_function_exists(mincore HAVE_MINCORE) check_function_exists(mincore HAVE_MINCORE)
## clear this out in case mysql modified it
set(CMAKE_REQUIRED_LIBRARIES "")
set(EXTRA_SYSTEM_LIBS "") set(EXTRA_SYSTEM_LIBS "")
check_function_exists(dlsym HAVE_DLSYM_WITHOUT_DL) check_function_exists(dlsym HAVE_DLSYM_WITHOUT_DL)
if (NOT HAVE_DLSYM_WITHOUT_DL) if (NOT HAVE_DLSYM_WITHOUT_DL)

7
cmake_modules/TokuSetupCompiler.cmake
View file

@ -92,15 +92,16 @@ set_cflags_if_supported(
) )
## set_cflags_if_supported_named("-Weffc++" -Weffcpp) ## set_cflags_if_supported_named("-Weffc++" -Weffcpp)
## Clang has stricter POD checks. So, only enable this warning on our other builds (Linux + GCC) if (CMAKE_CXX_FLAGS MATCHES -fno-implicit-templates)
if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
# must append this because mysql sets -fno-implicit-templates and we need to override it # must append this because mysql sets -fno-implicit-templates and we need to override it
# also clang doesn't support it on osx but also doesn't seem to know that
check_cxx_compiler_flag(-fimplicit-templates HAVE_CXX_-fimplicit-templates) check_cxx_compiler_flag(-fimplicit-templates HAVE_CXX_-fimplicit-templates)
if (HAVE_CXX_-fimplicit-templates) if (HAVE_CXX_-fimplicit-templates)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fimplicit-templates") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fimplicit-templates")
endif () endif ()
endif()
## Clang has stricter POD checks. So, only enable this warning on our other builds (Linux + GCC)
if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
set_cflags_if_supported( set_cflags_if_supported(
-Wpacked -Wpacked
) )