Don't check warnings for a legacy mac os x build.
This commit is contained in:
parent
445d5c8503
commit
3c0c624682
|
@ -105,7 +105,11 @@ before_script:
|
|||
qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests;
|
||||
fi
|
||||
else
|
||||
if [[ "$LEGACY" = false ]]; then
|
||||
qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests;
|
||||
else
|
||||
qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=noTests;
|
||||
fi
|
||||
fi
|
||||
script:
|
||||
- "$CXX --version"
|
||||
|
|
32
common.pri
32
common.pri
|
@ -329,23 +329,6 @@ defineReplace(FindLatestTagDistance){
|
|||
# In debug mode on Unix system we use all usefull for us compilers keys for checking errors.
|
||||
# Also trying make all possible for speed up build time.
|
||||
unix {
|
||||
|
||||
!macx{
|
||||
# Key -isystem disable checking errors in system headers. Mark ignore warnings Qt headers.
|
||||
ISYSTEM += \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtPrintSupport" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtTest" \
|
||||
-isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent"
|
||||
|
||||
} else {
|
||||
LIBS_USED_FOR_QT = \
|
||||
QtCore \
|
||||
QtSvg \
|
||||
|
@ -358,12 +341,17 @@ LIBS_USED_FOR_QT = \
|
|||
QtTest \
|
||||
QtConcurrent
|
||||
|
||||
for(somelib, $$list($$LIBS_USED_FOR_QT)) {
|
||||
QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers"
|
||||
QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers"
|
||||
# Key -isystem disable checking errors in system headers. Marking ignore for warnings in Qt headers.
|
||||
!macx{
|
||||
ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]"
|
||||
|
||||
ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers
|
||||
ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers
|
||||
for(somelib, $$list($$LIBS_USED_FOR_QT)) {
|
||||
ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]/$${somelib}"
|
||||
}
|
||||
} else {
|
||||
for(somelib, $$list($$LIBS_USED_FOR_QT)) {
|
||||
ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers"
|
||||
ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -279,7 +279,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -87,7 +87,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
@ -127,7 +127,6 @@ message(Data files: $$[QT_INSTALL_DATA])
|
|||
message(Translation files: $$[QT_INSTALL_TRANSLATIONS])
|
||||
message(Settings: $$[QT_INSTALL_SETTINGS])
|
||||
message(Examples: $$[QT_INSTALL_EXAMPLES])
|
||||
message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS})
|
||||
|
||||
# Path to recource file.
|
||||
win32:RC_FILE = share/resources/valentina.rc
|
||||
|
|
|
@ -65,7 +65,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -73,7 +73,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -87,7 +87,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -66,7 +66,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -62,7 +62,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -65,7 +65,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -71,7 +71,7 @@ CONFIG(debug, debug|release){
|
|||
# Debug mode
|
||||
}else{
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -60,7 +60,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -63,7 +63,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -82,7 +82,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -64,7 +64,7 @@ CONFIG(debug, debug|release){
|
|||
# Debug mode
|
||||
}else{
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -70,7 +70,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -62,7 +62,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -71,7 +71,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -71,7 +71,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += QT_NO_DEBUG_OUTPUT
|
||||
|
||||
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
|
||||
|
|
|
@ -83,7 +83,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
|
@ -113,7 +113,7 @@ include(warnings.pri)
|
|||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!*msvc*:!macx:CONFIG += silent
|
||||
!*msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
!unix:*g++*{
|
||||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
|
|
Loading…
Reference in New Issue
Block a user