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.

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

Use host srs.db #5033

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Use host srs.db #5033

merged 4 commits into from
Feb 28, 2024

Conversation

m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented Feb 13, 2024

No description provided.

nirvn
nirvn previously approved these changes Feb 13, 2024
@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Feb 13, 2024

@nirvn
Copy link
Member

nirvn commented Feb 13, 2024

@m-kuhn , the srs.db doesn't seem to update properly.

@m-kuhn
Copy link
Member Author

m-kuhn commented Feb 13, 2024

@m-kuhn , the srs.db doesn't seem to update properly.

In case you have time to look at the build logs from the relevant architectures, that could give some hints (I won't have time for it today)

@m-kuhn
Copy link
Member Author

m-kuhn commented Feb 13, 2024

is it possible that it updates the db on the host instead of the target?

@nirvn
Copy link
Member

nirvn commented Feb 25, 2024

@m-kuhn, two problems with this PR:

  • we can't always add -DNATIVE_CRSSYNC_BIN , we need it to actually build on host triplets (that's easy enough, we can add a conditional if (ANDROID or IOS) there; but
  • once we do that (tested locally), it doesn't work on Android or iOS, instead calling the native CRS sync either does nothing or updates the host srs.db (either way, the srs.db on Android/iOS's vcpkg_installed is not modified).

@m-kuhn
Copy link
Member Author

m-kuhn commented Feb 25, 2024

@nirvn do you happen to know if the srs.db file is correct on linux (and other not cross compiled targets)?

In this case we could drop the NATIVE_CRSSYNC_BIN and use

if(HOST_TRIPLET STREQUAL TARGET_TRIPLET)
  file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/qgis/resources/srs.db" "${CURRENT_PACKAGES_DIR}/share/qgis/resources/srs.db")
endif()

@nirvn
Copy link
Member

nirvn commented Feb 25, 2024

@m-kuhn , yes, on host linux, the srs.db was properly updated. Your solution makes a lot of sense.

@m-kuhn m-kuhn changed the title Use host crssync Use host srs.db Feb 25, 2024
@m-kuhn m-kuhn merged commit ccface2 into master Feb 28, 2024
23 checks passed
@m-kuhn m-kuhn deleted the crssync-host branch February 28, 2024 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants