Only build svg2qvg when not cross-compiling

Ideally we should use "option(host_build)", but that seems
complicated. In addition, some toolchains don't include libQt5Svg.so,
so we cannot build the tool then anyhow.
This commit is contained in:
Peter Hartmann 2020-04-27 17:43:04 +02:00
parent 2b6cf0417d
commit d02c08cea2
3 changed files with 15 additions and 5 deletions

View File

@ -59,8 +59,13 @@ SVGSOURCES = \
# writing application project files.
###########
# Convert path to shell path, otherwise it fails on Windows.
SVG2QVG=$$shell_path($${QSK_OUT_ROOT}/tools/bin/svg2qvg)
cross_compile {
# for now just assume that a desktop version of the tool is in the path
SVG2QVG=svg2qvg
} else {
# Convert path to shell path, otherwise it fails on Windows.
SVG2QVG=$$shell_path($${QSK_OUT_ROOT}/tools/bin/svg2qvg)
}
svg2qvg.name = SVG compiler
svg2qvg.input = SVGSOURCES

View File

@ -16,8 +16,13 @@ SVGSOURCES = \
svg/01.08.05q.svg \
svg/01.25.18.svg
# Convert path to shell path, otherwise it fails on Windows.
SVG2QVG=$$shell_path($${QSK_OUT_ROOT}/tools/bin/svg2qvg)
cross_compile {
# for now just assume that a desktop version of the tool is in the path
SVG2QVG=svg2qvg
} else {
# Convert path to shell path, otherwise it fails on Windows.
SVG2QVG=$$shell_path($${QSK_OUT_ROOT}/tools/bin/svg2qvg)
}
svg2qvg.name = SVG compiler
svg2qvg.input = SVGSOURCES

View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
qtHaveModule(svg) {
qtHaveModule(svg):!cross_compile {
SUBDIRS += \
svg2qvg