aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't check warnings for a legacy mac os x build.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-12-26 19:44:55 +02:00
parent 445d5c8503
commit 3c0c624682
21 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -105,7 +105,11 @@ before_script:
qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests; qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests;
fi fi
else else
if [[ "$LEGACY" = false ]]; then
qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests; 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 fi
script: script:
- "$CXX --version" - "$CXX --version"

32
common.pri
View File

@ -329,23 +329,6 @@ defineReplace(FindLatestTagDistance){
# In debug mode on Unix system we use all usefull for us compilers keys for checking errors. # 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. # Also trying make all possible for speed up build time.
unix { 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 = \ LIBS_USED_FOR_QT = \
QtCore \ QtCore \
QtSvg \ QtSvg \
@ -358,12 +341,17 @@ LIBS_USED_FOR_QT = \
QtTest \ QtTest \
QtConcurrent QtConcurrent
for(somelib, $$list($$LIBS_USED_FOR_QT)) { # Key -isystem disable checking errors in system headers. Marking ignore for warnings in Qt headers.
QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" !macx{
QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]"
ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers for(somelib, $$list($$LIBS_USED_FOR_QT)) {
ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers 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"
} }
} }

2
src/app/tape/tape.pro
View File

@ -279,7 +279,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

3
src/app/valentina/valentina.pro
View File

@ -87,7 +87,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll 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(Translation files: $$[QT_INSTALL_TRANSLATIONS])
message(Settings: $$[QT_INSTALL_SETTINGS]) message(Settings: $$[QT_INSTALL_SETTINGS])
message(Examples: $$[QT_INSTALL_EXAMPLES]) message(Examples: $$[QT_INSTALL_EXAMPLES])
message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS})
# Path to recource file. # Path to recource file.
win32:RC_FILE = share/resources/valentina.rc win32:RC_FILE = share/resources/valentina.rc

2
src/libs/fervor/fervor.pro
View File

@ -65,7 +65,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/ifc/ifc.pro
View File

@ -73,7 +73,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/qmuparser/qmuparser.pro
View File

@ -87,7 +87,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vformat/vformat.pro
View File

@ -66,7 +66,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vgeometry/vgeometry.pro
View File

@ -62,7 +62,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vlayout/vlayout.pro
View File

@ -65,7 +65,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vmisc/vmisc.pro
View File

@ -71,7 +71,7 @@ CONFIG(debug, debug|release){
# Debug mode # Debug mode
}else{ }else{
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vobj/vobj.pro
View File

@ -60,7 +60,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vpatterndb/vpatterndb.pro
View File

@ -63,7 +63,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vpropertyexplorer/vpropertyexplorer.pro
View File

@ -82,7 +82,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vtest/vtest.pro
View File

@ -64,7 +64,7 @@ CONFIG(debug, debug|release){
# Debug mode # Debug mode
}else{ }else{
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vtools/vtools.pro
View File

@ -70,7 +70,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/libs/vwidgets/vwidgets.pro
View File

@ -62,7 +62,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/test/CollectionTest/CollectionTest.pro
View File

@ -71,7 +71,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/test/ParserTest/ParserTest.pro
View File

@ -71,7 +71,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += QT_NO_DEBUG_OUTPUT DEFINES += QT_NO_DEBUG_OUTPUT
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols

2
src/test/TranslationsTest/TranslationsTest.pro
View File

@ -83,7 +83,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll

2
src/test/ValentinaTest/ValentinaTest.pro
View File

@ -113,7 +113,7 @@ include(warnings.pri)
CONFIG(release, debug|release){ CONFIG(release, debug|release){
# Release mode # Release mode
!*msvc*:!macx:CONFIG += silent !*msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
!unix:*g++*{ !unix:*g++*{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll