mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[vcpkg baseline][osgearth] Fix and add dependency tinyxml (#15900)
* [osgearth] Fix and add dependency tinyxml * update version record
This commit is contained in:
parent
5f215c65fe
commit
f53d9799c3
15
ports/osgearth/fix-tinyxml.patch
Normal file
15
ports/osgearth/fix-tinyxml.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c78bd16..bf31091 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -193,7 +193,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
|
||||
# TinyXML is an XML parsing library
|
||||
SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
|
||||
IF (WITH_EXTERNAL_TINYXML)
|
||||
- find_package(TinyXML REQUIRED)
|
||||
+ find_package(tinyxml CONFIG REQUIRED)
|
||||
+ set(TINYXML_FOUND 1)
|
||||
+ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
|
||||
ENDIF (WITH_EXTERNAL_TINYXML)
|
||||
|
||||
# postfix settings for various configs
|
@ -15,8 +15,12 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
make-all-find-packages-required.patch
|
||||
fix-tinyxml.patch
|
||||
)
|
||||
|
||||
# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002
|
||||
file(REMOVE ${SOURCE_PATH}/src/osgEarth/tinyxml.h)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "osgearth",
|
||||
"version": "3.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.",
|
||||
"homepage": "https://github.com/gwaldron/osgearth",
|
||||
"supports": "!(x86 | wasm32) & !staticcrt",
|
||||
@ -20,6 +20,7 @@
|
||||
]
|
||||
},
|
||||
"protobuf",
|
||||
"sqlite3"
|
||||
"sqlite3",
|
||||
"tinyxml"
|
||||
]
|
||||
}
|
||||
|
@ -4370,7 +4370,7 @@
|
||||
},
|
||||
"osgearth": {
|
||||
"baseline": "3.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"osi": {
|
||||
"baseline": "0.108.6",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa",
|
||||
"version": "3.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "d194c647fcf69fe345c13ae7b6da3451e4bbddb6",
|
||||
"version": "3.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user