-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
refactor(Geo): unify geo format system and embed minimal GDAL/PROJ #13986
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
Open
HTRamsey
wants to merge
7
commits into
mavlink:master
Choose a base branch
from
HTRamsey:feature/geo-updates
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+24,864
−3,439
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d8111b7
refactor(Geo): Comprehensive geo format system with unified registry
HTRamsey e800793
fix(ci): harden Geo dependency install and cross sqlite fallback
HTRamsey 4f96b46
fix(ci): stop dep install writes and harden sqlite wrapper
HTRamsey 3c6d5ec
fix(ci): harden AppImage packaging on arm runners
HTRamsey 131d6fe
fix(ci): add Android gstreamer download fallback URLs
HTRamsey 7ec3a44
fix(ci): skip GeographicLib install rules in bundled build
HTRamsey 101ae96
fix(ci): unblock linux and docker geo workflow failures
HTRamsey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/gdal.cmake b/gdal.cmake | ||
| index b5e5e4f..d8484cd 100644 | ||
| --- a/gdal.cmake | ||
| +++ b/gdal.cmake | ||
| @@ -611,9 +611,11 @@ install( | ||
| FRAMEWORK DESTINATION "${FRAMEWORK_DESTINATION}") | ||
|
|
||
| # Generate targets file for importing directly from GDAL build tree | ||
| -export(TARGETS ${GDAL_LIB_TARGET_NAME} | ||
| - NAMESPACE GDAL:: | ||
| - FILE "GDAL-targets.cmake") | ||
| +if(NOT CMAKE_SKIP_INSTALL_RULES) | ||
| + export(TARGETS ${GDAL_LIB_TARGET_NAME} | ||
| + NAMESPACE GDAL:: | ||
| + FILE "GDAL-targets.cmake") | ||
| +endif() | ||
|
|
||
| if (NOT GDAL_ENABLE_MACOSX_FRAMEWORK) | ||
| # Generate GdalConfig.cmake and GdalConfigVersion.cmake |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/cmake/modules/packages/FindHDFS.cmake b/cmake/modules/packages/FindHDFS.cmake | ||
| index 7d33c95..b18e141 100644 | ||
| --- a/cmake/modules/packages/FindHDFS.cmake | ||
| +++ b/cmake/modules/packages/FindHDFS.cmake | ||
| @@ -22,10 +22,12 @@ include(FindPackageHandleStandardArgs) | ||
|
|
||
| find_package(JNI) | ||
| if(JNI_FOUND) | ||
| - add_library(HDFS::JVM UNKNOWN IMPORTED) | ||
| - set_target_properties(HDFS::JVM PROPERTIES | ||
| - IMPORTED_LINK_INTERFACE_LANGUAGES "C" | ||
| - IMPORTED_LOCATION "${JAVA_JVM_LIBRARY}") | ||
| + if(NOT TARGET HDFS::JVM) | ||
| + add_library(HDFS::JVM UNKNOWN IMPORTED) | ||
| + set_target_properties(HDFS::JVM PROPERTIES | ||
| + IMPORTED_LINK_INTERFACE_LANGUAGES "C" | ||
| + IMPORTED_LOCATION "${JAVA_JVM_LIBRARY}") | ||
| + endif() | ||
| endif() | ||
|
|
||
| find_path(HDFS_INCLUDE_DIR NAMES hdfs.h) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -522,6 +522,8 @@ if(NOT _is_multi_config_generator) | ||
| endif() | ||
|
|
||
| configure_file(cmake/uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake @ONLY) | ||
| -add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake) | ||
| +if(NOT TARGET uninstall) | ||
| + add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake) | ||
| +endif() | ||
|
|
||
| message(STATUS "EMBED_RESOURCE_FILES=${EMBED_RESOURCE_FILES}") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed from 'None'/'Never' to 'InlineOnly'/'WithoutElse'. This allows single-line inline functions and simple if statements without else clauses. Ensure the team agrees with this style change as it affects code formatting across the project.