File tree Expand file tree Collapse file tree 4 files changed +49
-2
lines changed
Expand file tree Collapse file tree 4 files changed +49
-2
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,8 @@ qt_add_qml_module(QGroundControlModule
99 NO_PLUGIN
1010)
1111
12+ add_subdirectory (Utilities)
13+
1214add_subdirectory (ADSB)
1315add_subdirectory (AnalyzeView)
1416add_subdirectory (Android)
@@ -31,7 +33,6 @@ add_subdirectory(QmlControls)
3133add_subdirectory (Settings)
3234add_subdirectory (Terrain)
3335add_subdirectory (UI)
34- add_subdirectory (Utilities)
3536add_subdirectory (UTMSP)
3637add_subdirectory (Vehicle)
3738add_subdirectory (VideoManager)
Original file line number Diff line number Diff line change @@ -25,3 +25,40 @@ CPMAddPackage(
2525)
2626
2727target_link_libraries (${CMAKE_PROJECT_NAME} PRIVATE shp)
28+
29+ #===========================================================================#
30+
31+ CPMAddPackage(
32+ NAME PROJ
33+ VERSION 9.6.2
34+ GITHUB_REPOSITORY OSGeo/PROJ
35+ GIT_TAG 9.6.2
36+ OPTIONS
37+ "BUILD_EXAMPLES OFF"
38+ "BUILD_SHARED_LIBS OFF"
39+ "BUILD_TESTING OFF"
40+ "EMBED_RESOURCE_FILES ON"
41+ )
42+
43+ list (PREPEND CMAKE_PREFIX_PATH "${PROJ_BINARY_DIR} " )
44+
45+ # find_package(PROJ CONFIG REQUIRED)
46+
47+ #===========================================================================#
48+
49+ CPMAddPackage(
50+ NAME GDAL
51+ GITHUB_REPOSITORY OSGeo/gdal
52+ VERSION 3.11.3
53+ OPTIONS
54+ "BUILD_APPS OFF"
55+ "BUILD_SHARED_LIBS OFF"
56+ "BUILD_TESTING OFF"
57+ "GDAL_BUILD_OPTIONAL_DRIVERS OFF"
58+ "OGR_BUILD_OPTIONAL_DRIVERS OFF"
59+ "GDAL_USE_HDFS OFF"
60+ "CMAKE_DISABLE_FIND_PACKAGE_HDFS ON"
61+ "GDAL_USE_ZLIB_INTERNAL ON"
62+ )
63+
64+ target_link_libraries (${CMAKE_PROJECT_NAME} PRIVATE GDAL::GDAL)
Original file line number Diff line number Diff line change 117117apt-get install -y -qq --no-install-recommends \
118118 libusb-1.0-0-dev
119119
120+ # --------------------------------------------------------------------
121+ # GDAL
122+ # --------------------------------------------------------------------
123+ apt-get install -y -qq --no-install-recommends \
124+ libproj-dev \
125+ proj-bin \
126+ libgdal-dev \
127+ gdal-bin
128+
120129# --------------------------------------------------------------------
121130# Miscellaneous
122131# --------------------------------------------------------------------
Original file line number Diff line number Diff line change 88fi
99
1010brew update
11- brew install cmake ninja ccache git pkgconf create-dmg mold
11+ brew install cmake ninja ccache git pkgconf create-dmg mold proj gdal
1212
1313# Install GStreamer
1414GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx
You can’t perform that action at this time.
0 commit comments