WIP: Fix qttools build

OpenOrienteering · Sep 17, 2020 · 2f166fb · 2f166fb
1 parent ecdf19b
commit 2f166fb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/qt-5.15.1.cmake b/qt-5.15.1.cmake
@@ -572,13 +572,17 @@ superbuild_package(
   BUILD_CONDITION  ${use_system_qt}
   BUILD [[
     CONFIGURE_COMMAND
-      "${CMAKE_COMMAND}" -E make_directory src/assistant
-    COMMAND
-      "${CMAKE_COMMAND}" -E chdir src/assistant "@qmake@" "${SOURCE_DIR}/src/assistant"
+      "@qmake@" "${SOURCE_DIR}"
     COMMAND
       "${CMAKE_COMMAND}" -E make_directory src/linguist
     COMMAND
       "${CMAKE_COMMAND}" -E chdir src/linguist "@qmake@" "${SOURCE_DIR}/src/linguist"
+    $<$<NOT:$<BOOL:@ANDROID@>>:COMMAND
+    COMMAND
+      "${CMAKE_COMMAND}" -E make_directory src/assistant
+    COMMAND
+      "${CMAKE_COMMAND}" -E chdir src/assistant "@qmake@" "${SOURCE_DIR}/src/assistant"
+    >
     BUILD_COMMAND
       "$(MAKE)" -C src/linguist
     $<$<NOT:$<BOOL:@ANDROID@>>:COMMAND