diff options
| author | Linus Jahn <lnj@kaidan.im> | 2019-12-13 21:19:26 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2020-07-31 15:05:24 +0200 |
| commit | c19bafc60c1c2e9a73cb3d212293462a1be4eb47 (patch) | |
| tree | 089269cabcc8b75832a6ce3cff8ec5e4020b0de0 /util | |
| parent | 5d69aa3ee1214cf689e2357bff8688f2ff138471 (diff) | |
QtCore: Use system-wide libb2 if present
This adds the option to build Qt with libb2, which is especially
recommended, if you care about the performance of the BLAKE2 hashing
algorithms. The bundled version is the pure reference C implementation
of BLAKE2, while libb2 has many additional hardware optimizations.
However, the API of both is the same, so no changes to the code were
necessary here.
Change-Id: I3563982f4e07be300291fe103c38b16a404b3ebb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cmake/helper.py | 1 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 02a241b018..c2aa49168c 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -412,6 +412,7 @@ _library_map = [ LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"), LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"), # see also libjpeg LibraryMapping("libatomic", "WrapAtomic", "WrapAtomic::WrapAtomic"), + LibraryMapping("libb2", "Libb2", "PkgConfig::Libb2"), LibraryMapping("libclang", "WrapLibClang", "WrapLibClang::WrapLibClang"), LibraryMapping("libdl", None, "${CMAKE_DL_LIBS}"), LibraryMapping("libinput", "Libinput", "Libinput::Libinput"), diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index defadee3f3..a01795a833 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1645,6 +1645,7 @@ def map_condition(condition: str) -> str: and not feature_name.startswith("system_doubleconversion") and not feature_name.startswith("system_sqlite") and not feature_name.startswith("system_hunspell") + and not feature_name.startswith("system_libb2") ): part = "ON" elif feature == "dlopen": |