libosmium: unvendor gdalcpp

Requires conan-io#23829.
valgur · Apr 30, 2024 · 887e2e2 · 887e2e2
1 parent 5c9397c
commit 887e2e2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/recipes/libosmium/all/conanfile.py b/recipes/libosmium/all/conanfile.py
@@ -61,7 +61,7 @@ def requirements(self):
         if self.options.geos:
             self.requires("geos/3.12.0")
         if self.options.gdal:
-            self.requires("gdal/3.8.3")
+            self.requires("gdalcpp/1.3.0")
         if self.options.proj:
             self.requires("proj/9.3.1")
         if self.options.lz4:
@@ -87,7 +87,7 @@ def _module_rel_path(self):
 
     def package(self):
         copy(self, "LICENSE", self.source_folder, os.path.join(self.package_folder, "licenses"))
-        copy(self, "*", os.path.join(self.source_folder, "include"), os.path.join(self.package_folder, "include"))
+        copy(self, "*", os.path.join(self.source_folder, "include", "osmium"), os.path.join(self.package_folder, "include", "osmium"))
         copy(self, "libosmium-official-vars.cmake", self.source_folder, os.path.join(self.package_folder, self._modules_rel_dir))
 
     def package_info(self):
@@ -122,7 +122,7 @@ def _add_component(name, reqs, threads=False):
         if self.options.geos:
             _add_component("geos", ["geos::geos"])
         if self.options.gdal:
-            _add_component("gdal", ["gdal::gdal"])
+            _add_component("gdal", ["gdalcpp::gdalcpp"])
         if self.options.proj:
             _add_component("proj", ["proj::proj"])
         if self.options.lz4: