3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[osgearth] Fix find_path regression (#27672)

Browse Source 
* [osgearth] Fix find_path regression

* Update version

* Run x-add-version
This commit is contained in:
Connor Broyles 2022-11-07 18:37:32 -05:00 committed by GitHub
parent ebec9d7288
commit 4941494d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/osgearth/fix-osgearth-config.patch
View File

@ -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}
)

2
ports/osgearth/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -5586,7 +5586,7 @@
},
"osgearth": {
"baseline": "3.3",
"port-version": 3
"port-version": 4
},
"osi": {
"baseline": "0.108.6",

5
versions/o-/osgearth.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "208b0c23a8e79910067bb0b8a6dc589da7307de5",
"version": "3.3",
"port-version": 4
},
{
"git-tree": "6c024ede3cf289475ceeeccc91045868db965c02",
"version": "3.3",