summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-02-11 15:45:33 +0100
committerKai Koehne <kai.koehne@qt.io>2019-02-12 09:47:23 +0000
commit7b434c0287a67eb58413b7f5781d849d2080786f (patch)
tree894ab2a1cb662d67f5e9d3e95d151ebe6cc49185 /util
parent443ee65d3b73c901c62e642130cbe3063c405467 (diff)
CMake: Fix build of system jpeg is not available
Change-Id: Ie7462db556d0615e74755fa4fc3b51f625aade2f Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/configurejson2cmake.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 8bf9b77459..23bd81cb5e 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -698,6 +698,9 @@ def parseFeature(ctx, feature, data, cm_fh):
'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )'
},
'incredibuild_xge': None,
+ 'jpeg': {
+ 'condition': 'QT_FEATURE_imageformatplugin AND JPEG_FOUND'
+ },
'ltcg': None,
'msvc_mp': None,
'optimize_debug': None,