Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[ogre] Add assimp as dependency (#14032)

This commit is contained in:
NancyLi1013 2020-10-15 05:28:34 +08:00 committed by GitHub
parent f18ed8584b
commit 23f5251f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/ogre/fix-dependency.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
index 2ae0b6694..068dd27dd 100644
index 2ae0b66..e6c55cd 100644
--- a/CMake/Dependencies.cmake
+++ b/CMake/Dependencies.cmake
@@ -242,7 +242,7 @@ find_package(FreeImage)
@ -11,7 +11,7 @@ index 2ae0b6694..068dd27dd 100644
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
# Find X11
@@ -310,7 +310,7 @@ find_package(SWIG 3.0.8 QUIET)
@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET)
macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "")
# pugixml
@ -20,6 +20,11 @@ index 2ae0b6694..068dd27dd 100644
macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "")
# Assimp
-find_package(ASSIMP QUIET)
+find_package(Assimp CONFIG REQUIRED)
macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "")
if(ASSIMP_FOUND)
@@ -336,7 +336,7 @@ endif()
# Find sdl2
if(NOT ANDROID AND NOT EMSCRIPTEN)

2
ports/ogre/vcpkg.json
View File

@ -1,9 +1,11 @@
{
"name": "ogre",
"version-string": "1.12.9",
"port-version": 1,
"description": "3D Object-Oriented Graphics Rendering Engine",
"homepage": "https://github.com/OGRECave/ogre",
"dependencies": [
"assimp",
"freeimage",
"freetype",
{