diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /util | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).
Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 4 | ||||
| -rw-r--r-- | util/cmake/helper.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 32394f31c4..11918f1a32 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -57,6 +57,8 @@ def map_tests(test: str) -> Optional[str]: "c++11": "$<COMPILE_FEATURES:cxx_std_11>", "c++14": "$<COMPILE_FEATURES:cxx_std_14>", "c++1z": "$<COMPILE_FEATURES:cxx_std_17>", + "c++17": "$<COMPILE_FEATURES:cxx_std_17>", + "c++20": "$<COMPILE_FEATURES:cxx_std_20>", "c99": "$<COMPILE_FEATURES:c_std_99>", "c11": "$<COMPILE_FEATURES:c_std_11>", "x86SimdAlways": "ON", # FIXME: Make this actually do a compile test. @@ -489,6 +491,8 @@ def parseTest(ctx, test, data, cm_fh): skip_tests = { "c++11", "c++14", + "c++17", + "c++20", "c++1y", "c++1z", "c11", diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 9927be28bd..df6b8773f0 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -374,6 +374,7 @@ _library_map = [ LibraryMapping("glib", "GLIB2", "GLIB2::GLIB2"), LibraryMapping("gnu_iconv", None, None), LibraryMapping("gtk3", "GTK3", "PkgConfig::GTK3"), + LibraryMapping("gssapi", "GSSAPI", "GSSAPI::GSSAPI"), LibraryMapping("harfbuzz", "harfbuzz", "harfbuzz::harfbuzz"), LibraryMapping("host_dbus", None, None), LibraryMapping( |