Fix static and Android releases (maplibre#148)

* Fix Android release * Fix static build installation issues
ntadej · Jul 27, 2024 · d9cc9eb · d9cc9eb
1 parent 9120c8a
commit d9cc9eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
@@ -140,7 +140,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.3]
+        qt_version: [6.5.3, 6.6.3, 6.7.2]
 
     steps:
       - name: Download artifacts for x86

diff --git a/src/location/macros.cmake b/src/location/macros.cmake
@@ -25,16 +25,6 @@ function(qmaplibre_location_setup_plugins target)
         set(_targetDestination "${_targetDestination}/")
     endif()
 
-    get_target_property(_targetTypeCore QMapLibre::Core TYPE)
-    if(_targetTypeCore STREQUAL STATIC_LIBRARY)
-        target_link_libraries(
-            ${target}
-            PRIVATE
-                QMapLibre::PluginGeoServices
-                QMapLibre::PluginQml
-        )
-    endif()
-
     set_target_properties(
         ${target}
         PROPERTIES
@@ -46,6 +36,17 @@ function(qmaplibre_location_setup_plugins target)
     list(REMOVE_DUPLICATES _importPathCache)
     set(QML_IMPORT_PATH ${_importPathCache} CACHE STRING "QML import path for QtCreator" FORCE)
 
+    get_target_property(_targetTypeCore QMapLibre::Core TYPE)
+    if(_targetTypeCore STREQUAL STATIC_LIBRARY)
+        target_link_libraries(
+            ${target}
+            PRIVATE
+                QMapLibre::PluginGeoServices
+                QMapLibre::PluginQml
+        )
+        return()
+    endif()
+
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         file(
             COPY "${_ImportedLocationGeoServices}"