osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI. 

svn path=/trunk/; revision=52674
This commit is contained in:
Jeff Morriss 2013-10-18 17:42:32 +00:00
parent db68b808dd
commit 2ac63d7a44
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -831,6 +831,20 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wwrite-strings)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wc++-compat, C)
# The Qt headers generate a ton of shortening errors on 64-bit systems.
# See if we can add the flag.
# We could first check if we're 64-bit or not...
CXXFLAGS_save="$CXXFLAGS"
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-shorten-64-to-32, CXX)
if test "$CXXFLAGS" != "$CXXFLAGS_save"
then
CXX_NO_SHORTEN_WARNING_FLAGS=-Wno-shorten-64-to-32
else
CXX_NO_SHORTEN_WARNING_FLAGS=
fi
AC_SUBST(CXX_NO_SHORTEN_WARNING_FLAGS)
CXXFLAGS="$CXXFLAGS_save"
#
# XXX - OK for C++?
#
@ -1346,7 +1360,7 @@ if test "x$enable_wireshark" = "xyes"; then
[
CFLAGS="$CFLAGS $Qt_CFLAGS"
CXXFLAGS="$CXXFLAGS $Qt_CFLAGS"
have_qt=yes
have_qt=yes
GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt"
OSX_APP_FLAGS="$OSX_APP_FLAGS -qt"
OSX_DMG_FLAGS="-qt"

3
ui/qt/Makefile.am
View File

@ -63,7 +63,8 @@ libqtui_a_DEPENDENCIES =
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
$(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS) $(AM_CLEAN_CFLAGS)
$(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS) $(AM_CLEAN_CFLAGS) \
$(CXX_NO_SHORTEN_WARNING_FLAGS)
AM_V_MOC = $(am__v_MOC_@AM_V@)
am__v_MOC_ = $(am__v_MOC_@AM_DEFAULT_V@)