From 812cc76b026108e208bfc8d20fe1daa8168a00eb Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Wed, 15 Apr 2020 13:57:13 +0200
Subject: CMake: Update pro2cmake and friend to convert QtVirtualkeyboard

Expand $$MODULE_BASE_DIR to ${QT_BUILD_DIR}.

Add library mappings for Hunspell.

Add test mappings for QtVirtualKeyboard regarding 3rdparty Hunspell and
T9Write.

Change-Id: Ief007456d0471cbcf9a03d819291edec5f63680f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 util/cmake/configurejson2cmake.py | 3 +++
 util/cmake/helper.py              | 1 +
 util/cmake/pro2cmake.py           | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 5a77c36b4e..85ac26ec2b 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -127,6 +127,9 @@ def map_tests(test: str) -> Optional[str]:
         "libinput_axis_api": "ON",
         "xlib": "X11_FOUND",
         "wayland-scanner": "WaylandScanner_FOUND",
+        "3rdparty-hunspell": "VKB_HAVE_3RDPARTY_HUNSPELL",
+        "t9write-alphabetic": "VKB_HAVE_T9WRITE_ALPHA",
+        "t9write-cjk": "VKB_HAVE_T9WRITE_CJK",
     }
     if test in testmap:
         return testmap.get(test, None)
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 150610dc68..06fcb83f9d 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -587,6 +587,7 @@ _library_map = [
     LibraryMapping("webp", "WrapWebP", "WrapWebP::WrapWebP"),
     LibraryMapping("jasper", "WrapJasper", "WrapJasper::WrapJasper"),
     LibraryMapping("sdl2", "WrapSDL2", "WrapSDL2::WrapSDL2"),
+    LibraryMapping("hunspell", "Hunspell", "Hunspell::Hunspell"),
     LibraryMapping(
         "assimp",
         "WrapAssimp",
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index bbfa65300c..9e183a4b13 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -1613,6 +1613,7 @@ def map_condition(condition: str) -> str:
                     and not feature_name.startswith("system_assimp")
                     and not feature_name.startswith("system_doubleconversion")
                     and not feature_name.startswith("system_sqlite")
+                    and not feature_name.startswith("system_hunspell")
                 ):
                     part = "ON"
                 elif feature == "dlopen":
@@ -1633,6 +1634,7 @@ _path_replacements = {
     "$$[QT_INSTALL_EXAMPLES]": "${INSTALL_EXAMPLESDIR}",
     "$$[QT_INSTALL_TESTS]": "${INSTALL_TESTSDIR}",
     "$$OUT_PWD": "${CMAKE_CURRENT_BINARY_DIR}",
+    "$$MODULE_BASE_OUTDIR": "${QT_BUILD_DIR}",
 }
 
 
-- 
cgit v1.2.3