[ogre] fix feature tools on osx (#31000)

This commit is contained in:
autoantwort 2023-04-22 00:47:17 +02:00 committed by GitHub
parent ba91cb86ae
commit 1bbcffd4d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 1 deletions

View File

@ -21,6 +21,7 @@ vcpkg_from_github(
cfg-rel-paths.patch cfg-rel-paths.patch
swig-python-polyfill.patch swig-python-polyfill.patch
pkgconfig.patch pkgconfig.patch
same-install-rules-all-platforms.patch
) )
file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")

View File

@ -0,0 +1,14 @@
diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
index c4e6de8..e92da59 100644
--- a/CMake/Utils/OgreConfigTargets.cmake
+++ b/CMake/Utils/OgreConfigTargets.cmake
@@ -56,9 +56,6 @@ elseif (UNIX)
set(OGRE_LIB_RELEASE_PATH "")
set(OGRE_LIB_RELWDBG_PATH "")
set(OGRE_LIB_DEBUG_PATH "")
- if(APPLE AND NOT APPLE_IOS)
- set(OGRE_RELEASE_PATH "/${PLATFORM_NAME}")
- endif()
if(APPLE AND APPLE_IOS)
set(OGRE_LIB_RELEASE_PATH "/Release")
endif(APPLE AND APPLE_IOS)

View File

@ -1,6 +1,7 @@
{ {
"name": "ogre", "name": "ogre",
"version": "13.6.2", "version": "13.6.2",
"port-version": 1,
"description": "3D Object-Oriented Graphics Rendering Engine", "description": "3D Object-Oriented Graphics Rendering Engine",
"homepage": "https://github.com/OGRECave/ogre", "homepage": "https://github.com/OGRECave/ogre",
"license": "MIT", "license": "MIT",

View File

@ -5702,7 +5702,7 @@
}, },
"ogre": { "ogre": {
"baseline": "13.6.2", "baseline": "13.6.2",
"port-version": 0 "port-version": 1
}, },
"ogre-next": { "ogre-next": {
"baseline": "2.3.1", "baseline": "2.3.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b7ec525c0cd854d1da91a5a11cd05109693b9333",
"version": "13.6.2",
"port-version": 1
},
{ {
"git-tree": "dda1cee749cebb6fc251073a702e6a698fd4521e", "git-tree": "dda1cee749cebb6fc251073a702e6a698fd4521e",
"version": "13.6.2", "version": "13.6.2",