diff --git a/.appveyor.yml b/.appveyor.yml index be21d1e..5ada0fa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,17 @@ environment: VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"' JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"' NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' - ZIP_LOC: 7z - CLANG_FORMAT_LOC: '"C:\Program Files\LLVM\bin\clang-format.exe"' - COMPILER: msvc - VSVER: 14 + ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"' + LLVM_LOC: '"C:\Program Files\LLVM\bin\"' + BUILD_PACKAGE: "1" + + - QT_LOC: '"C:\Qt\5.11.2\msvc2017_64\bin\"' + VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"' + JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"' + NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' + ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"' + LLVM_LOC: '"C:\Program Files\LLVM\bin\"' + BUILD_CLANG: '"1"' clone_depth: 1 @@ -18,11 +25,11 @@ init: - set TAG_NAME=%APPVEYOR_REPO_TAG_NAME% build_script: - - python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable %CLANG_FORMAT_LOC% --color always + - python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable "C:\Program Files\LLVM\bin\clang-format.exe" --color always - call "build_windows.cmd" artifacts: - - path: bin\win64\AdvancedSettings.zip + - path: bin\win64\AdvancedSettings*.7z name: portable - - path: installer\AdvancedSettings-Installer.exe + - path: installer\AdvancedSettings*.exe name: installer diff --git a/advancedSettings.pro b/advancedSettings.pro index 467a80c..02f2372 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -22,8 +22,13 @@ TEMPLATE = app QMAKE_CXXFLAGS_WARN_ON -= -W3 #C4127 was in a third party file with no way to turn off. QMAKE_CXXFLAGS += /W4 /wd4127 - QMAKE_CXXFLAGS += /WX - + !*clang-msvc { + #win32-clang-msvc is unable to correctly build the first time + #with warnings as errors on. There seems to be an issue with the moc_predefs.h + #file not being built correctly when /WX is on. Until the issue is fixed, + #win32-clang-msvc is built without /WX. + QMAKE_CXXFLAGS += /WX + } } *g++* {