[osgearth] Fix find_path regression (microsoft#27672)

* [osgearth] Fix find_path regression * Update version * Run x-add-version
sarvex · Nov 7, 2022 · 4941494 · 4941494
1 parent ebec9d7
commit 4941494
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/ports/osgearth/fix-osgearth-config.patch b/ports/osgearth/fix-osgearth-config.patch
@@ -1,5 +1,5 @@
 diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in
-index 3f27dffe9..4141ff939 100644
+index 3f27dffe9..c787e7668 100644
 --- a/osgEarthConfig.cmake.in
 +++ b/osgEarthConfig.cmake.in
 @@ -6,52 +6,54 @@ set(XPREFIX OSGEARTH)
@@ -15,8 +15,9 @@ index 3f27dffe9..4141ff939 100644
 +set(osgEarth_DEFINITIONS ${${XPREFIX}_CFLAGS})
 
 -find_path(osgearth_INCLUDE_DIR
+-    NAMES OSGEARTH/RTREE.H
 +find_path(osgEarth_INCLUDE_DIR
-     NAMES OSGEARTH/RTREE.H
++    NAMES osgEarth/rtree.h
      HINTS ${${XPREFIX}_INCLUDE_DIRS}
  )
 

diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osgearth",
   "version": "3.3",
-  "port-version": 3,
+  "port-version": 4,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "license": "LGPL-3.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5586,7 +5586,7 @@
     },
     "osgearth": {
       "baseline": "3.3",
-      "port-version": 3
+      "port-version": 4
     },
     "osi": {
       "baseline": "0.108.6",

diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "208b0c23a8e79910067bb0b8a6dc589da7307de5",
+      "version": "3.3",
+      "port-version": 4
+    },
     {
       "git-tree": "6c024ede3cf289475ceeeccc91045868db965c02",
       "version": "3.3",