From 125c4832cd655668367b8e90a052bc73f86dc29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 10 Feb 2020 11:19:18 +0100 Subject: [PATCH] appveyor: download and install z3 so the gui can be built --- appveyor.yml | 16 ++++++++++------ gui/gui.pro | 11 ++++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0a0a8ea1f..44c222aff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,6 +57,10 @@ environment: install: - pip install pytest + - SET p=x86 + - IF "%platform%"=="x64" SET p=x64 + - curl -fsSL https://github.com/Z3Prover/z3/releases/download/z3-4.8.7/z3-4.8.7-%p%-win.zip -o z3-4.8.7-win.zip + - 7z e z3-4.8.7-win.zip -oz3 -r -y build_script: - ECHO Building %configuration% %platform% with MSVC %VisualStudioVersion% using %PlatformToolset% PlatformToolset @@ -71,12 +75,12 @@ build_script: - copy bin\cppcheck.exe .. - cd .. # build gui.. - #- ECHO MYQTDIR=%MYQTDIR% - #- 'IF defined MYQTDIR cd gui' - #- 'IF defined MYQTDIR set QTDIR=%MYQTDIR%' - #- 'IF defined MYQTDIR %QTDIR%\bin\qmake' - #- 'IF defined MYQTDIR nmake' - #- 'IF defined MYQTDIR cd ..' + - ECHO MYQTDIR=%MYQTDIR% + - 'IF defined MYQTDIR cd gui' + - 'IF defined MYQTDIR set QTDIR=%MYQTDIR%' + - 'IF defined MYQTDIR %QTDIR%\bin\qmake' + - 'IF defined MYQTDIR nmake' + - 'IF defined MYQTDIR cd ..' test_script: - build\bin\testrunner.exe -q diff --git a/gui/gui.pro b/gui/gui.pro index d98e152a5..9f809ae92 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -6,7 +6,8 @@ CONFIG += warn_on debug DEPENDPATH += . \ ../lib INCLUDEPATH += . \ - ../lib + ../lib \ + ../z3 QT += widgets QT += printsupport @@ -14,10 +15,14 @@ contains(LINKCORE, [yY][eE][sS]) { LIBS += -l../bin/cppcheck-core DEFINES += CPPCHECKLIB_IMPORT } -LIBS += -L$$PWD/../externals +LIBS += -L$$PWD/../externals -L$$PWD/../z3 # z3 -LIBS += -lz3 +win32 { + LIBS += -llibz3 +} else { + LIBS += -lz3 +} QMAKE_CXXFLAGS += -DUSE_Z3 DESTDIR = .