diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-11 17:04:11 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-12 11:33:39 +0000 |
| commit | 8f0eb6557970a2407afa7190e617afdc5d3ef691 (patch) | |
| tree | 43ada8c4be9a0e85b62627855b659ed09ce10f34 /util/cmake | |
| parent | 859b36ca143bd2955f97f167ede7f14029326f6c (diff) | |
CMake: Configurejson2cmake: Always enable system-pcre2 and handle dlopen
Handle dlopen properly. Code is ifdef-ed on it, so we need it:-/
Change-Id: I7f35d24b97530796a4cdcdc1acbe139757170215
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 1edb4b44a1..f870637e15 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -288,10 +288,10 @@ def map_condition(condition): assert isinstance(condition, str) mapped_features = { - "dlopen": "ON", 'gbm': 'gbm_FOUND', "system-xcb": "ON", "system-freetype": "ON", + 'system-pcre2': 'ON', } # Turn foo != "bar" into (NOT foo STREQUAL 'bar') @@ -694,7 +694,9 @@ def parseFeature(ctx, feature, data, cm_fh): 'cross_compile': None, 'debug_and_release': None, 'debug': None, - 'dlopen': None, # handled by CMAKE_DL_LIBS + 'dlopen': { + 'condition': 'UNIX', + }, 'doubleconversion': None, 'enable_gdb_index': None, 'enable_new_dtags': None, |