Skip to content

[ogre] Add assimp as dependency #14032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 5 commits into from
Oct 14, 2020
Merged

[ogre] Add assimp as dependency #14032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c68874
[ogre] Fix build error
Oct 14, 2020
7409e5f
Add dependency
Oct 14, 2020
4af7b2d
Update ports/ogre/vcpkg.json
NancyLi1013 Oct 14, 2020
48fa214
Format
Oct 14, 2020
dad17ae
Merge branch 'dev/NancyLi/fix-ogre' of https://github.com/NancyLi1013…
Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ports/ogre/fix-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions ports/ogre/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
{
Expand Down