Allow custom build to override application window icon on Linux

Author: Maarrk

src/CMakeLists.txt

@@ -9,6 +9,8 @@ qt_add_qml_module(QGroundControlModule
     NO_PLUGIN
 )
 
+add_subdirectory(Utilities)
+
 add_subdirectory(ADSB)
 add_subdirectory(AnalyzeView)
 add_subdirectory(Android)
@@ -31,7 +33,6 @@ add_subdirectory(QmlControls)
 add_subdirectory(Settings)
 add_subdirectory(Terrain)
 add_subdirectory(UI)
-add_subdirectory(Utilities)
 add_subdirectory(UTMSP)
 add_subdirectory(Vehicle)
 add_subdirectory(VideoManager)

src/Utilities/Shape/CMakeLists.txt

@@ -25,3 +25,44 @@ CPMAddPackage(
 )
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE shp)
+
+#===========================================================================#
+
+CPMAddPackage(
+    NAME PROJ
+    VERSION 9.6.2
+    GITHUB_REPOSITORY OSGeo/PROJ
+    GIT_TAG 9.6.2
+    OPTIONS
+        "BUILD_EXAMPLES OFF"
+        "BUILD_SHARED_LIBS OFF"
+        "BUILD_TESTING OFF"
+        "EMBED_RESOURCE_FILES ON"
+)
+
+set(PROJ_INCLUDE_DIR "${PROJ_SOURCE_DIR}/include" CACHE PATH "")
+set(PROJ_LIBRARY     "${PROJ_BINARY_DIR}/src/libproj.a" CACHE FILEPATH "")
+# Some finders also look at these hints:
+set(PROJ_ROOT "${PROJ_BINARY_DIR}" CACHE PATH "")
+set(PROJ_DIR  "${PROJ_BINARY_DIR}" CACHE PATH "")
+# Optional, helps version checks in some setups:
+set(PROJ_VERSION "9.6.2" CACHE STRING "")
+
+#===========================================================================#
+
+CPMAddPackage(
+    NAME GDAL
+    GITHUB_REPOSITORY OSGeo/gdal
+    VERSION 3.11.3
+    OPTIONS
+        "BUILD_APPS OFF"
+        "BUILD_SHARED_LIBS OFF"
+        "BUILD_TESTING OFF"
+        "GDAL_BUILD_OPTIONAL_DRIVERS OFF"
+        "OGR_BUILD_OPTIONAL_DRIVERS OFF"
+        "GDAL_USE_HDFS OFF"
+        "CMAKE_DISABLE_FIND_PACKAGE_HDFS ON"
+        "GDAL_USE_ZLIB_INTERNAL ON"
+)
+
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE GDAL::GDAL)

tools/setup/install-dependencies-debian.sh

@@ -117,6 +117,15 @@ fi
 apt-get install -y -qq --no-install-recommends \
     libusb-1.0-0-dev
 
+# --------------------------------------------------------------------
+# GDAL
+# --------------------------------------------------------------------
+apt-get install -y -qq --no-install-recommends \
+    libproj-dev \
+    proj-bin \
+    libgdal-dev \
+    gdal-bin
+
 # --------------------------------------------------------------------
 # Miscellaneous
 # --------------------------------------------------------------------

tools/setup/install-dependencies-osx.sh

@@ -8,7 +8,7 @@ then
 fi
 
 brew update
-brew install cmake ninja ccache git pkgconf create-dmg mold
+brew install cmake ninja ccache git pkgconf create-dmg mold proj gdal
 
 # Install GStreamer
 GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx