Activate PDAL

opengisch · Feb 9, 2024 · 988999b · 988999b
1 parent 29c2582
commit 988999b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 26 deletions.
diff --git a/cmake/qgis-cmake-wrapper.cmake b/cmake/qgis-cmake-wrapper.cmake
@@ -120,6 +120,10 @@ if(TRUE) # Should possibly have a "static only" check
   endif()
   # End Terrible hack
 
+  find_package(PDAL CONFIG REQUIRED)
+  target_include_directories(QGIS::Core INTERFACE ${PDAL_INCLUDE_DIRS})
+  target_link_libraries(QGIS::Core INTERFACE ${PDAL_LIBRARIES})
+
   find_library(Qca-ossl_LIBRARIES NAMES qca-ossl PATH_SUFFIXES Qca/crypto)
   target_link_libraries(QGIS::Core INTERFACE ${Qca-ossl_LIBRARIES})
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -18,6 +18,10 @@
       "name": "gdal",
       "default-features": false
     },
+    {
+      "name": "pdal",
+      "default-features": false
+    },
     "nu-book-zxing-cpp",
     {
       "name": "qca-qt6",

diff --git a/vcpkg/ports/qgis-qt6/portfile.cmake b/vcpkg/ports/qgis-qt6/portfile.cmake
@@ -36,7 +36,7 @@ list(APPEND QGIS_OPTIONS "-DWITH_QTWEBKIT:BOOL=OFF")
 list(APPEND QGIS_OPTIONS "-DWITH_GRASS7:BOOL=OFF")
 list(APPEND QGIS_OPTIONS "-DWITH_SPATIALITE:BOOL=ON")
 list(APPEND QGIS_OPTIONS "-DWITH_QSPATIALITE:BOOL=OFF")
-list(APPEND QGIS_OPTIONS "-DWITH_PDAL:BOOL=OFF")
+list(APPEND QGIS_OPTIONS "-DWITH_PDAL:BOOL=ON")
 list(APPEND QGIS_OPTIONS "-DWITH_DRACO:BOOL=ON")
 list(APPEND QGIS_OPTIONS "-DWITH_INTERNAL_POLY2TRI:BOOL=OFF")
 

diff --git a/vcpkg/ports/qgis-qt6/vcpkg.json b/vcpkg/ports/qgis-qt6/vcpkg.json
@@ -27,38 +27,48 @@
       "protobuf",
       "proj",
       "geos",
+      {
+        "name": "pdal",
+        "default-features": false,
+        "features": [
+          "draco",
+          "e57",
+          "i3s",
+          "zstd"
+        ]
+      },
       "poly2tri",
       {
         "name": "libtasn1",
         "platform": "ios | osx"
       },
       {
         "name": "qtbase",
-          "features":
-          [
-                "brotli",
-                "concurrent",
-                "default-features",
-                "doubleconversion",
-                "freetype",
-                "gui",
-                "harfbuzz",
-                "jpeg",
-                "network",
-                {
-                    "name":"openssl",
-                    "platform": "!ios"
-                },
-                "pcre2",
-                "png",
-                "sql",
-                "sql-sqlite",
-                "testlib",
-                "thread",
-                "widgets",
-                "zstd"
-          ],
-              "default-features": false
+        "features":
+        [
+          "brotli",
+          "concurrent",
+          "default-features",
+          "doubleconversion",
+          "freetype",
+          "gui",
+          "harfbuzz",
+          "jpeg",
+          "network",
+          {
+            "name":"openssl",
+            "platform": "!ios"
+          },
+          "pcre2",
+          "png",
+          "sql",
+          "sql-sqlite",
+          "testlib",
+          "thread",
+          "widgets",
+          "zstd"
+        ],
+        "default-features": false
       },
       "qtsvg",
       "qtlocation",