From 6714ec1247e47fde4b2693d530132bf5de31821f Mon Sep 17 00:00:00 2001
From: Rich Prohaska <prohaska@tokutek.com>
Date: Wed, 17 Dec 2014 16:44:02 -0500
Subject: DB-783 append -Wvla to compiler flags to allow variable length arrays
 to be used in tokudb

---
 storage/tokudb/CMakeLists.txt | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'storage')

diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index faeb50f924f..2a1d4988a06 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -46,18 +46,34 @@ include(CheckCXXCompilerFlag)
 
 macro(set_cflags_if_supported)
   foreach(flag ${ARGN})
-    check_c_compiler_flag(${flag} HAVE_C_${flag})
-    if (HAVE_C_${flag})
+    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_${flag})
-    if (HAVE_CXX_${flag})
+    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)
 
 ADD_SUBDIRECTORY(ft-index)
 
-- 
cgit v1.2.1