[GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time

https://bugs.webkit.org/show_bug.cgi?id=116450

Reviewed by Martin Robinson.

The -fno-rtti flag is used when compiling C++ source code throughout the project. The TestWebKitAPI
programs fail to compile because of this when using the C++11 standard as the GTest headers assume by
default that the RTTI support is available. This can be turned off by passing GTEST_HAS_RTTI=0 to the
TestWebKitAPI programs when compiling them.

* TestWebKitAPI/GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4e2707d..efe8cab 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time
+        https://bugs.webkit.org/show_bug.cgi?id=116450
+
+        Reviewed by Martin Robinson.
+
+        The -fno-rtti flag is used when compiling C++ source code throughout the project. The TestWebKitAPI
+        programs fail to compile because of this when using the C++11 standard as the GTest headers assume by
+        default that the RTTI support is available. This can be turned off by passing GTEST_HAS_RTTI=0 to the
+        TestWebKitAPI programs when compiling them.
+
+        * TestWebKitAPI/GNUmakefile.am:
+
 2013-05-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         Remove DriverProxy._running_drivers from webkitpy.layout_tests.port

diff --git a/Tools/TestWebKitAPI/GNUmakefile.am b/Tools/TestWebKitAPI/GNUmakefile.am
index 72f4759..e0f8913 100644 (file)
--- a/Tools/TestWebKitAPI/GNUmakefile.am
+++ b/Tools/TestWebKitAPI/GNUmakefile.am
@@ -37,6 +37,7 @@ Programs_TestWebKitAPI_TestWTF_CPPFLAGS = \
        $(CAIRO_CFLAGS)
 
 Programs_TestWebKitAPI_TestWTF_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
 Programs_TestWebKitAPI_TestWTF_LDADD = \
@@ -78,6 +79,7 @@ Programs_TestWebKitAPI_TestJavaScriptCore_CPPFLAGS = \
        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS)
 
 Programs_TestWebKitAPI_TestJavaScriptCore_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
 Programs_TestWebKitAPI_TestJavaScriptCore_LDADD = \
@@ -124,6 +126,7 @@ Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
        -I$(top_builddir)/DerivedSources/WebCore/include
 
 Programs_TestWebKitAPI_TestWebCore_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
 Programs_TestWebKitAPI_TestWebCore_LDADD = \
@@ -175,6 +178,10 @@ Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS)
 
+Programs_TestWebKitAPI_TestGtk_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
+       $(global_cxxflags)
+
 Programs_TestWebKitAPI_TestGtk_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
@@ -206,6 +213,10 @@ Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS)
 
+Programs_TestWebKitAPI_TestWebKit2_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
+       $(global_cxxflags)
+
 Programs_TestWebKitAPI_TestWebKit2_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
@@ -319,6 +330,7 @@ Libraries_libTestWebKitAPIInjectedBundle_la_CPPFLAGS = \
        $(GTK_CFLAGS)
 
 Libraries_libTestWebKitAPIInjectedBundle_la_CXXFLAGS = \
+       -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
 Libraries_libTestWebKitAPIInjectedBundle_la_CFLAGS = \