From f2c50190b37bb9e4c65df6b378abbf1eab69e173 Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Thu, 8 Oct 2015 14:34:15 -0400 Subject: [PATCH] Add note to Windows developers to turn off -MP when using jom. Specify we're using jom in appveyor --- .appveyor.yml | 2 +- QGCCommon.pri | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3e803c325..767ee2a88 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 6a76a5647..8f5c5fc98 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 + } } # -- 2.22.0