From f96cff58df74ba4e0e6b50d9cd2cfb8cf863b421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 May 2021 09:31:10 +0200 Subject: [PATCH 01/10] fetchFromGitea: init --- pkgs/build-support/fetchgitea/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/build-support/fetchgitea/default.nix diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix new file mode 100644 index 000000000000..79804588cfe5 --- /dev/null +++ b/pkgs/build-support/fetchgitea/default.nix @@ -0,0 +1,7 @@ +# Gitea's URLs are compatible with GitHub + +{ lib, fetchFromGitHub }: + +{ domain, ... }@args: + +fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..4c5c0b454db4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -556,6 +556,8 @@ in fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; + fetchFromGitea = callPackage ../build-support/fetchgitea { }; + fetchFromGitHub = callPackage ../build-support/fetchgithub {}; fetchFromBitbucket = callPackage ../build-support/fetchbitbucket {}; From 0492987aea856d55f9c798c45935b69b97992faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:42:40 +0200 Subject: [PATCH 02/10] librttopo: init at 1.1.0 --- .../libraries/librttopo/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/librttopo/default.nix diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix new file mode 100644 index 000000000000..d349278d5f5d --- /dev/null +++ b/pkgs/development/libraries/librttopo/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitea +, autoreconfHook +, geos +}: + +stdenv.mkDerivation rec { + pname = "librttopo"; + version = "1.1.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitea { + domain = "git.osgeo.org/gitea"; + owner = "rttopo"; + repo = "librttopo"; + rev = "librttopo-${version}"; + sha256 = "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ geos ]; + + meta = with lib; { + description = "RT Topology Library"; + homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5c0b454db4..55971887b2a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16564,6 +16564,8 @@ in librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { }; + librttopo = callPackage ../development/libraries/librttopo { }; + libs3 = callPackage ../development/libraries/libs3 { }; libschrift = callPackage ../development/libraries/libschrift { }; From 06df299b9e85f62b94269d4c58b2384a66affc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:32:45 +0200 Subject: [PATCH 03/10] libspatialite: 4.3.0a -> 5.0.1 --- .../libraries/libspatialite/default.nix | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 2e9dadf0bf5d..592b7101a074 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,34 +1,54 @@ -{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }: - -with lib; +{ lib +, stdenv +, fetchurl +, pkg-config +, geos +, librttopo +, libxml2 +, minizip +, proj +, sqlite +, libiconv +}: stdenv.mkDerivation rec { - name = "libspatialite-4.3.0a"; + pname = "libspatialite"; + version = "5.0.1"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; - sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${pname}-${version}.tar.gz"; + sha256 = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; + buildInputs = [ + geos + librttopo + libxml2 + minizip + proj + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ]; configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; - CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - - postInstall = "" + optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/mod_spatialite.{so,dylib} ''; - meta = { + meta = with lib; { description = "Extensible spatial index library in C++"; homepage = "https://www.gaia-gis.it/fossil/libspatialite"; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; }; } From 1b4dc54d4011a1920effc11a6116bf2ac539ed37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 00:41:00 +0200 Subject: [PATCH 04/10] spatialite_tools: 4.1.1 -> 5.0.0 --- .../libraries/spatialite-tools/default.nix | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ffded04510b4..ee6d05247dc6 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ lib +, stdenv +, fetchurl +, pkg-config +, geos +, expat +, librttopo +, libspatialite +, libxml2 +, minizip +, proj +, readosm +, sqlite +}: stdenv.mkDerivation rec { - name = "spatialite-tools-4.1.1"; + pname = "spatialite-tools"; + version = "5.0.0"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; - sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${pname}-${version}.tar.gz"; + sha256 = "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; + + buildInputs = [ + expat + geos + librttopo + libspatialite + libxml2 + minizip + proj + readosm + sqlite + ]; configureFlags = [ "--disable-freexl" ]; @@ -17,10 +42,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lsqlite3"; - meta = { + meta = with lib; { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = lib.platforms.linux; + license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; }; } From 1ec7d100efd29b6e7dc1b953c115c5a98eda7c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 22:21:41 +0200 Subject: [PATCH 05/10] proj: build using CMake QMapShack relies on PROJ providing a CMake configuration. --- pkgs/development/libraries/proj/default.nix | 32 ++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 92119a8788d7..3bbc4c6da33a 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, sqlite +, libtiff +, curl +, gtest +}: stdenv.mkDerivation rec { pname = "proj"; @@ -11,19 +20,34 @@ stdenv.mkDerivation rec { sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; }; + postPatch = lib.optionalString (version == "7.2.1") '' + substituteInPlace CMakeLists.txt \ + --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" + ''; + outputs = [ "out" "dev"]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sqlite libtiff curl ]; + checkInputs = [ gtest ]; + + cmakeFlags = [ + "-DUSE_EXTERNAL_GTEST=ON" + ]; + doCheck = stdenv.is64bit; + preCheck = '' + export HOME=$TMPDIR + ''; + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ vbgl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl dotlambda ]; }; } From d4aa09175b1f1fcd0d1e5649e8b6faeac582d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 23:35:27 +0200 Subject: [PATCH 06/10] python3Packages.pyproj: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/pyproj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 2f4f26f03b43..98e3e802c6ee 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = version; - sha256 = "1q1i1235cp3k32dpb11r7krx5rpqwszb89mrx85rflc1z5acaj58"; + sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E="; }; # force pyproj to use ${proj} From 93f419b7a843f7239977fb974d48331ac6ab34dd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 25 May 2021 17:32:14 +0100 Subject: [PATCH 07/10] qgis: 3.16.6 -> 3.16.7 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3669cf0771b1..5b972ae5017f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.6"; + version = "3.16.7"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1vnz5kiyjircmhn4vq3fa5j2kvkxpwcsry7jc6nxl0w0dqx1zay1"; + sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p"; }; passthru = { From 187b6cd41f4d17a76b5afe23d81ad014d0d62f52 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 25 May 2021 17:54:56 +0100 Subject: [PATCH 08/10] postgis: 3.1.1 -> 3.1.2 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index f3f7a4a69114..81f3f4fee254 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.1"; + version = "3.1.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"; + sha256 = "0ch7gry8a1i9114mlhklxryn7ja3flsz6pxj9r5p09k92xh3gp9c"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From 90a8fbf146cbba06e631bc7fe26ac32f2ade9198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 23:10:45 +0200 Subject: [PATCH 09/10] python3Packages.python-mapnik: add pythonImportsCheck --- pkgs/development/python-modules/python-mapnik/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index b1b0c70d8602..228e0d74ebc2 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -63,6 +63,8 @@ in buildPythonPackage rec { ]); propagatedBuildInputs = [ pillow pycairo ]; + pythonImportsCheck = [ "mapnik" ] ; + meta = with lib; { description = "Python bindings for Mapnik"; homepage = "https://mapnik.org"; From 103d945f801a6e4c0a16faebaaeaa917d9e81f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:17:35 +0200 Subject: [PATCH 10/10] qmapshack: 1.15.2 -> 1.16.0 https://github.com/Maproom/qmapshack/releases/tag/V_1.16.0 --- pkgs/applications/gis/qmapshack/default.nix | 11 +- .../qmapshack/pr350-support-quazip-1x.patch | 141 ------------------ 2 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index 30231e7135ac..d0d39e299aa2 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7"; + sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx"; }; nativeBuildInputs = [ cmake ]; @@ -20,13 +20,6 @@ mkDerivation rec { "-DROUTINO_XML_PATH=${routino}/share/routino" ]; - patches = [ - "${src}/FindPROJ4.patch" - - # Support QuaZip 1.x. - ./pr350-support-quazip-1x.patch - ]; - qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" ]; diff --git a/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch b/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch deleted file mode 100644 index 82ebed14dbbf..000000000000 --- a/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001 -From: kiozen -Date: Sat, 20 Mar 2021 12:14:29 +0100 -Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x - -Simply adjusted the cmake scripts ---- - CMakeLists.txt | 2 +- - src/qmapshack/CMakeLists.txt | 27 +++++++++++++-------------- - 3 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d2cf127..7420d9b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED) - find_package(PROJ REQUIRED) - find_package(JPEG REQUIRED) - find_package(ROUTINO REQUIRED) --find_package(QuaZip5 REQUIRED) -+find_package(QuaZip-Qt5 REQUIRED) - find_package(ALGLIB ) # optional as we can use our local version - - -diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt -index 08eeb183..9b3836d6 100644 ---- a/src/qmapshack/CMakeLists.txt -+++ b/src/qmapshack/CMakeLists.txt -@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH}) - # All source files needed to compile - ############################################################################################### - --set( SRCS -- CAbout.cpp -+set( SRCS -+ CAbout.cpp - CMainWindow.cpp - CSingleInstanceProxy.cpp - canvas/CCanvas.cpp -@@ -160,7 +160,7 @@ set( SRCS - gis/trk/CInvalidTrk.cpp - gis/trk/CKnownExtension.cpp - gis/trk/CListTrkPts.cpp -- gis/trk/CPropertyTrk.cpp -+ gis/trk/CPropertyTrk.cpp - gis/trk/CScrOptTrk.cpp - gis/trk/CSelectActivityColor.cpp - gis/trk/CTableTrk.cpp -@@ -272,7 +272,7 @@ set( SRCS - mouse/line/CLineOpMovePoint.cpp - mouse/line/CLineOpSelectRange.cpp - mouse/line/CScrOptEditLine.cpp -- mouse/line/CScrOptRangeLine.cpp -+ mouse/line/CScrOptRangeLine.cpp - mouse/line/ILineOp.cpp - mouse/line/IMouseEditLine.cpp - plot/CPlot.cpp -@@ -401,7 +401,7 @@ set( HDRS - gis/CGisListDB.h - gis/CGisListWks.h - gis/CGisWorkspace.h -- gis/CSelDevices.h -+ gis/CSelDevices.h - gis/IGisItem.h - gis/IGisLine.h - gis/Poi.h -@@ -512,7 +512,7 @@ set( HDRS - gis/trk/CInvalidTrk.h - gis/trk/CKnownExtension.h - gis/trk/CListTrkPts.h -- gis/trk/CPropertyTrk.h -+ gis/trk/CPropertyTrk.h - gis/trk/CScrOptTrk.h - gis/trk/CSelectActivityColor.h - gis/trk/CTableTrk.h -@@ -579,7 +579,7 @@ set( HDRS - map/CMapList.h - map/CMapMAP.h - map/CMapPathSetup.h -- map/CMapPropSetup.h -+ map/CMapPropSetup.h - map/CMapRMAP.h - map/CMapTMS.h - map/CMapVRT.h -@@ -655,7 +655,7 @@ set( HDRS - realtime/CRtSelectSource.h - realtime/CRtWorkspace.h - realtime/IRtInfo.h -- realtime/IRtRecord.h -+ realtime/IRtRecord.h - realtime/IRtSource.h - realtime/gpstether/CRtGpsTether.h - realtime/gpstether/CRtGpsTetherInfo.h -@@ -764,7 +764,7 @@ set( UIS - gis/search/IGeoSearchWebConfigDialog.ui - gis/search/ISearchExplanationDialog.ui - gis/summary/IGisSummary.ui -- gis/summary/IGisSummarySetup.ui -+ gis/summary/IGisSummarySetup.ui - gis/trk/ICombineTrk.ui - gis/trk/ICutTrk.ui - gis/trk/IDetailsTrk.ui -@@ -818,7 +818,7 @@ set( UIS - mouse/range/IActionSelect.ui - mouse/range/IRangeToolSetup.ui - mouse/range/IScrOptRangeTool.ui -- mouse/range/IScrOptRangeTrk.ui -+ mouse/range/IScrOptRangeTrk.ui - mouse/IScrOptRuler.ui - mouse/IScrOptSelect.ui - mouse/line/IScrOptEditLine.ui -@@ -899,7 +899,6 @@ include_directories( - ${PROJ_INCLUDE_DIRS} - ${ROUTINO_INCLUDE_DIRS} - ${ALGLIB_INCLUDE_DIRS} -- ${QUAZIP_INCLUDE_DIRS} - ) - - if(APPLE) -@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND) - - target_link_libraries(${APPLICATION_NAME} - Qt5::Widgets -- Qt5::Xml -+ Qt5::Xml - Qt5::Sql - Qt5::PrintSupport -- Qt5::UiTools -+ Qt5::UiTools - Qt5::Network - Qt5::WebEngineWidgets - Qt5::Qml -@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME} - ${PROJ_LIBRARIES} - ${ROUTINO_LIBRARIES} - ${ALGLIB_LIBRARIES} -- ${QUAZIP_LIBRARIES} -+ QuaZip::QuaZip - ) - - if(APPLE)