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

cmake_modules/TokuFeatureDetection.cmake

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

cmake_modules/TokuSetupCompiler.cmake

@@ -92,15 +92,16 @@ set_cflags_if_supported(
   )
 ## set_cflags_if_supported_named("-Weffc++" -Weffcpp)
 
-## Clang has stricter POD checks.  So, only enable this warning on our other builds (Linux + GCC)
-if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
+if (CMAKE_CXX_FLAGS MATCHES -fno-implicit-templates)
   # 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)
   if (HAVE_CXX_-fimplicit-templates)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fimplicit-templates")
   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(
     -Wpacked
     )