diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-30 16:54:42 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-02-27 16:02:29 +0000 |
| commit | b1fa25e7b8974fd9ce4b6d1283b9a43da532992e (patch) | |
| tree | 2c52ffbf625b5e51ea7217c54e07ac6c022ac7ac /util | |
| parent | 885494c50f75b79a33a9275221ae9e0efb91349c (diff) | |
CMake: Small unsorted fixes in preparation of upgrading to dev branch
Change-Id: Id4d03558e956c6994dc6a8b701030ba4edf86adf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 5d189558bd..a684130c68 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -550,10 +550,12 @@ def parseInput(ctx, input, data, cm_fh): # }, def parseTest(ctx, test, data, cm_fh): skip_tests = { - 'c11', 'c99', 'c++11', 'c++14', 'c++1y', 'c++1z', - 'reduce_exports', + 'c11', 'c99', + 'gc_binaries', 'posix-iconv', "sun-iconv", + 'precomile_header', + 'reduce_exports', 'separate_debug_info', # FIXME: see if cmake can do this 'gc_binaries', 'libinput_axis_api', @@ -720,7 +722,7 @@ def parseFeature(ctx, feature, data, cm_fh): 'optimize_size': None, 'pkg-config': None, 'posix_fallocate': None, # Only needed for sqlite, which we do not want to build - 'posix_libiconv': { + 'posix-libiconv': { 'condition': 'NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib', 'enable': 'TEST_posix_iconv AND TEST_iconv_needlib', 'disable': 'NOT TEST_posix_iconv OR NOT TEST_iconv_needlib', |