cleanup cmake project

janbar · Aug 13, 2024 · 2c43da5 · 2c43da5
1 parent 2a2958e
commit 2c43da5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/android/AddQtAndroidApk.cmake b/android/AddQtAndroidApk.cmake
@@ -222,7 +222,7 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET)
                 set(EXTRA_LIBS "${LIB}")
             endif()
         endforeach()
-        set(QT_ANDROID_APP_EXTRA_LIBS "${EXTRA_LIBS}")
+        set(QT_ANDROID_APP_EXTRA_LIBS "\"android-extra-libs\": \"${EXTRA_LIBS}\",")
     endif()
 
     # set the list of dependant plugins (android-extra-plugins)
@@ -234,8 +234,8 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET)
                 set(EXTRA_PLUGINS "${PLUGIN}")
             endif()
         endforeach()
+        set(QT_ANDROID_APP_EXTRA_PLUGINS "\"android-extra-plugins\": \"${EXTRA_PLUGINS}\",")
     endif()
-    set(QT_ANDROID_APP_EXTRA_PLUGINS "${EXTRA_PLUGINS}")
 
     # make sure that the output directory for the Android package exists
     set(QT_ANDROID_APP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_TARGET}-${ANDROID_ABI})

diff --git a/android/qtdeploy.json.in b/android/qtdeploy.json.in
@@ -15,6 +15,7 @@
  "android-app-name": "@QT_ANDROID_APP_NAME@",
  "qml-root-path": "@CMAKE_SOURCE_DIR@",
  "stdcpp-path": "@QT_ANDROID_STL_PATH@",
- "android-extra-libs": "@QT_ANDROID_APP_EXTRA_LIBS@",
+ @QT_ANDROID_APP_EXTRA_LIBS@
+ @QT_ANDROID_APP_EXTRA_PLUGINS@
  "android-package-source-directory": "@QT_ANDROID_APP_PACKAGE_SOURCE_ROOT@"
 }