From 6a25a86d375b03805686e82dbe9e9974f92bf5dd Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Fri, 11 Nov 2011 11:21:52 +0100 Subject: Add a -force-asserts option to configure We have the following scenario: Either you build a release package without asserts, or a debug package with asserts. However, in embedded development, we need asserts also in release packages. This flag allows you to build a release package, but Q_ASSERTs still fire. Change-Id: Icd1dd4dd63c3cafecf515b40741263d902ad42d1 Reviewed-by: Joerg Bornemann Reviewed-by: Thiago Macieira --- configure | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index d6fd170502..974f6ac1de 100755 --- a/configure +++ b/configure @@ -833,6 +833,7 @@ CFG_COREWLAN=auto CFG_ICD=auto CFG_NOPROCESS=no CFG_ICU=auto +CFG_FORCE_ASSERTS=no # initalize variables used for installation QT_INSTALL_PREFIX= @@ -1037,7 +1038,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu|-force-asserts) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -2403,6 +2404,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + force-asserts) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_FORCE_ASSERTS="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -7251,6 +7259,10 @@ if [ "$CFG_ICU" = "yes" ]; then QT_CONFIG="$QT_CONFIG icu" fi +if [ "$CFG_FORCE_ASSERTS" = "yes" ]; then + QT_CONFIG="$QT_CONFIG force_asserts" +fi + # # Some Qt modules are too advanced in C++ for some old compilers # Detect here the platforms where they are known to work. -- cgit v1.2.3