Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static and Android releases #148

Merged
merged 2 commits into from
Jul 27, 2024
Merged

Fix static and Android releases #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d33dcdb
Fix Android release
ntadej Jun 25, 2024
3d84466
Fix static build installation issues
ntadej Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions src/location/macros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down
Loading