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>
This commit is contained in:
parent
885494c50f
commit
b1fa25e7b8
@ -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',
|
||||
|
Loading…
x
Reference in New Issue
Block a user