Skip to content

Utilities: Add GDAL #12848

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Utilities: Add GDAL #12848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ target_link_libraries(${CMAKE_PROJECT_NAME}

target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

add_subdirectory(Utilities)

add_subdirectory(ADSB)
add_subdirectory(AnalyzeView)
add_subdirectory(Android)
Expand All @@ -73,7 +75,7 @@ add_subdirectory(QmlControls)
add_subdirectory(Settings)
add_subdirectory(Terrain)
add_subdirectory(UI)
add_subdirectory(Utilities)

add_subdirectory(UTMSP)
add_subdirectory(Vehicle)
add_subdirectory(VideoManager)
Expand Down
3 changes: 1 addition & 2 deletions src/Utilities/Compression/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ CPMAddPackage(
GIT_TAG develop
OPTIONS
"ZLIB_BUILD_TESTING OFF"
"ZLIB_BUILD_SHARED OFF"
"ZLIB_BUILD_SHARED ON"
"ZLIB_BUILD_STATIC ON"
"ZLIB_BUILD_MINIZIP OFF"
"ZLIB_INSTALL OFF"
"ZLIB_PREFIX OFF"
"${ZLIB_EXTRA_OPTIONS}"
)

Expand Down
27 changes: 27 additions & 0 deletions src/Utilities/Shape/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,30 @@ CPMAddPackage(
)

target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE shp)

#===========================================================================#

# CPMAddPackage(
# NAME PROJ
# VERSION 9.6.0
# GITHUB_REPOSITORY OSGeo/PROJ
# GIT_TAG 9.6.0
# OPTIONS
# "BUILD_EXAMPLES OFF"
# "BUILD_SHARED_LIBS OFF"
# "BUILD_TESTING OFF"
# )

CPMAddPackage(
NAME GDAL
GITHUB_REPOSITORY OSGeo/gdal
VERSION 3.11.0
OPTIONS
"BUILD_APPS OFF"
"BUILD_SHARED_LIBS OFF"
"BUILD_TESTING OFF"
"GDAL_BUILD_OPTIONAL_DRIVERS OFF"
"OGR_BUILD_OPTIONAL_DRIVERS OFF"
)

# target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE GDAL::gdal)
5 changes: 5 additions & 0 deletions tools/setup/install-dependencies-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ DEBIAN_FRONTEND=noninteractive apt-get -y --quiet install \
DEBIAN_FRONTEND=noninteractive apt-get -y --quiet install \
libshp-dev

# GDAL
DEBIAN_FRONTEND=noninteractive apt-get -y --quiet install \
libproj-dev \
proj-bin

# DNS
# DEBIAN_FRONTEND=noninteractive apt-get -y --quiet install libavahi-compat-libdnssd-dev

Expand Down
2 changes: 1 addition & 1 deletion tools/setup/install-dependencies-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ then
fi

brew update
brew install cmake ninja ccache git pkgconf create-dmg
brew install cmake ninja ccache git pkgconf create-dmg proj

# Install GStreamer
GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx
Expand Down
Loading