Mercurial > hg > sonic-visualiser
changeset 1731:5185ee58c44b vext
Pull out capnp-regen, update CI configs
| author | Chris Cannam |
|---|---|
| date | Mon, 10 Jul 2017 12:55:47 +0100 |
| parents | 7aa88d988abb |
| children | 76872ffc03a3 |
| files | .appveyor.yml base.pri capnp-regen.pri |
| diffstat | 3 files changed, 21 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.appveyor.yml Mon Jul 10 11:54:33 2017 +0100 +++ b/.appveyor.yml Mon Jul 10 12:55:47 2017 +0100 @@ -3,6 +3,9 @@ only: - vext +configuration: + - Release + install: - cinst --allow-empty-checksums smlnj - ps: '"[hostfingerprints]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
--- a/base.pri Mon Jul 10 11:54:33 2017 +0100 +++ b/base.pri Mon Jul 10 12:55:47 2017 +0100 @@ -36,6 +36,7 @@ include(bq-files.pri) include(vamp-plugin-sdk-files.pri) include(svcore/files.pri) +include(capnp-regen.pri) DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) @@ -66,18 +67,3 @@ SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp -capnpc.target = piper-cpp/vamp-capnp/piper-capnp.h -capnpc.depends = $$PWD/piper/capnp/piper.capnp - -capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends - -macx* { - capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends -} - -win* { - capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends -} - -QMAKE_EXTRA_TARGETS += capnpc -PRE_TARGETDEPS += $$capnpc.target
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/capnp-regen.pri Mon Jul 10 12:55:47 2017 +0100 @@ -0,0 +1,17 @@ + +capnpc.target = piper-cpp/vamp-capnp/piper-capnp.h +capnpc.depends = $$PWD/piper/capnp/piper.capnp + +capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends + +macx* { + capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends +} + +win32-msvc* { + capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends +} + +QMAKE_EXTRA_TARGETS += capnpc +PRE_TARGETDEPS += $$capnpc.target +