Mercurial > hg > sonic-visualiser
changeset 1768:f684b19ab777
Fix for VC2017, plus add the generated files to the clean target
| author | Chris Cannam |
|---|---|
| date | Fri, 16 Feb 2018 08:27:04 +0000 |
| parents | f635ca0a8781 |
| children | 0698743f52a4 bd14a0f69b60 |
| files | capnp-regen.pri |
| diffstat | 1 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/capnp-regen.pri Fri Feb 09 12:25:16 2018 +0000 +++ b/capnp-regen.pri Fri Feb 16 08:27:04 2018 +0000 @@ -14,10 +14,21 @@ win32-msvc* { # This config is actually for 64-bit Windows builds -- see - # comments in noconfig.pri + # comments in noconfig.pri. + + # With MSVC2017 we have a problem that the header dependency is + # written out with the relative path from the build dir to the + # source dir (e.g. ..\sonic-visualiser\...) so if the header + # target path doesn't match that, the build fails before + # regenerating it. Not a problem with VC2015 for some reason. + # I hope using the relative path as target should fix it without + # breaking the VC2015 build. + + capnpc.target = ../$$basename(PWD)/piper-cpp/vamp-capnp/piper.capnp.h 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 +QMAKE_CLEAN += $$capnpc.target