diff --git a/.appveyor.yml b/.appveyor.yml index 3e803c3257393ef92777eca55d0fce6da548a0e9..767ee2a88020a0ef328379503aa8a49c4a6c148a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ install: - cinst nsis -y -installArgs /D="%programfiles(x86)%\NSIS" build_script: - - C:\Qt\5.4\msvc2013_opengl\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn qgroundcontrol.pro + - C:\Qt\5.4\msvc2013_opengl\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn CONFIG+=jombuild qgroundcontrol.pro - jom -j 4 test_script: diff --git a/QGCCommon.pri b/QGCCommon.pri index 6a76a5647ca566da33011bd1dd9d1325b5881a78..8f5c5fc98446460f89970af4dbe6e3996d07c535 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -168,8 +168,11 @@ WindowsBuild { DEFINES += __STDC_LIMIT_MACROS # Specify multi-process compilation within Visual Studio. # (drastically improves compilation times for multi-core computers) - QMAKE_CXXFLAGS_DEBUG += -MP - QMAKE_CXXFLAGS_RELEASE += -MP + !jombuild { + message("When using jom/QtCreator please add CONFIG+=jombuild to your project build settings") + QMAKE_CXXFLAGS_DEBUG += -MP + QMAKE_CXXFLAGS_RELEASE += -MP + } } #