diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-10-15 05:28:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 14:28:34 -0700 |
| commit | 23f5251f90a94f91f103fafccc3c366f565634a5 (patch) | |
| tree | 3ca00b795e7a5ef4fc43cc241a7a3994d61321ad | |
| parent | f18ed8584b1d32626dc765424339d8e0a4d98262 (diff) | |
| download | vcpkg-23f5251f90a94f91f103fafccc3c366f565634a5.tar.gz vcpkg-23f5251f90a94f91f103fafccc3c366f565634a5.zip | |
[ogre] Add assimp as dependency (#14032)
| -rw-r--r-- | ports/ogre/fix-dependency.patch | 9 | ||||
| -rw-r--r-- | ports/ogre/vcpkg.json | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/ogre/fix-dependency.patch b/ports/ogre/fix-dependency.patch index dfe3815bf..3bc67dfe0 100644 --- a/ports/ogre/fix-dependency.patch +++ b/ports/ogre/fix-dependency.patch @@ -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) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 707387147..c3d81afa8 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -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", { |