Make possible disable Address Sanitizer.

--HG-- branch : develop
2015-05-11 10:10:25 +03:00 · 2015-05-11 10:10:25 +03:00 · c1980cc7aa
commit c1980cc7aa
parent c73b2f51e1
10 changed files with 118 additions and 74 deletions
--- a/Valentina.pri
+++ b/Valentina.pri
@ -168,8 +168,7 @@ GCC_DEBUG_CXXFLAGS += \
    -Wstrict-overflow=5 \
    -Wundef \
    -Wno-unused \
-    -ftrapv \
-    -fsanitize=address #gcc’s 4.8.0 Address Sanitizer
+    -ftrapv

 # Usefull Clang warnings keys.
 CLANG_DEBUG_CXXFLAGS += \
--- a/src/app/app.pro
+++ b/src/app/app.pro
@ -88,10 +88,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${RCC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/ifc/ifc.pro
+++ b/src/libs/ifc/ifc.pro
@ -64,10 +64,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${MOC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/qmuparser/qmuparser.pro
+++ b/src/libs/qmuparser/qmuparser.pro
@ -75,10 +75,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${MOC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/vgeometry/vgeometry.pro
+++ b/src/libs/vgeometry/vgeometry.pro
@ -54,10 +54,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${MOC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/vlayout/vlayout.pro
+++ b/src/libs/vlayout/vlayout.pro
@ -56,10 +56,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${MOC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/vobj/vobj.pro
+++ b/src/libs/vobj/vobj.pro
@ -54,10 +54,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${MOC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro
+++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro
@ -78,10 +78,15 @@ CONFIG(debug, debug|release){
            QMAKE_CXXFLAGS -= \
                -Wswitch-default

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }

        clang*{
--- a/src/test/ParserTest/ParserTest.pro
+++ b/src/test/ParserTest/ParserTest.pro
@ -54,10 +54,15 @@ CONFIG(debug, debug|release){
            QMAKE_CXXFLAGS += \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-        QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-        QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
        QMAKE_CXXFLAGS += \
--- a/src/test/ValentinaTest/ValentinaTest.pro
+++ b/src/test/ValentinaTest/ValentinaTest.pro
@ -58,10 +58,15 @@ CONFIG(debug, debug|release){
                -isystem "$${OUT_PWD}/$${RCC_DIR}" \
                $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.

+            noAddressSanitizer{
+                # do nothing
+            } else {
                #gcc’s 4.8.0 Address Sanitizer
                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
-            QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer
-            QMAKE_LFLAGS+=-fsanitize=address
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
        }
        clang*{
            QMAKE_CXXFLAGS += \