Skip to content

Commit a9393bb

Browse files
committed
Utilities: Add GDAL
1 parent d9ab0c6 commit a9393bb

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

src/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
4949

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

52+
add_subdirectory(Utilities)
53+
5254
add_subdirectory(ADSB)
5355
add_subdirectory(AnalyzeView)
5456
add_subdirectory(Android)
@@ -73,7 +75,7 @@ add_subdirectory(QmlControls)
7375
add_subdirectory(Settings)
7476
add_subdirectory(Terrain)
7577
add_subdirectory(UI)
76-
add_subdirectory(Utilities)
78+
7779
add_subdirectory(UTMSP)
7880
add_subdirectory(Vehicle)
7981
add_subdirectory(VideoManager)

src/Utilities/Shape/CMakeLists.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,30 @@ CPMAddPackage(
2525
)
2626

2727
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE shp)
28+
29+
#===========================================================================#
30+
31+
# CPMAddPackage(
32+
# NAME PROJ
33+
# VERSION 9.6.0
34+
# GITHUB_REPOSITORY OSGeo/PROJ
35+
# GIT_TAG 9.6.0
36+
# OPTIONS
37+
# "BUILD_EXAMPLES OFF"
38+
# "BUILD_SHARED_LIBS OFF"
39+
# "BUILD_TESTING OFF"
40+
# )
41+
42+
CPMAddPackage(
43+
NAME GDAL
44+
GITHUB_REPOSITORY OSGeo/gdal
45+
VERSION 3.11.0
46+
OPTIONS
47+
"BUILD_APPS OFF"
48+
"BUILD_SHARED_LIBS OFF"
49+
"BUILD_TESTING OFF"
50+
"GDAL_BUILD_OPTIONAL_DRIVERS OFF"
51+
"OGR_BUILD_OPTIONAL_DRIVERS OFF"
52+
)
53+
54+
# target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE GDAL::gdal)

tools/setup/install-dependencies-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -y --quiet install \
185185
mesa-va-drivers \
186186
mesa-vdpau-drivers \
187187
mesa-vulkan-drivers \
188+
proj-bin \
188189
va-driver-all \
189190
vainfo \
190191
wayland-protocols

tools/setup/install-dependencies-osx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ then
88
fi
99

1010
brew update
11-
brew install cmake ninja ccache git pkgconf create-dmg
11+
brew install cmake ninja ccache git pkgconf create-dmg proj
1212

1313
# Install GStreamer
1414
GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx

0 commit comments

Comments
 (0)