From 8be318a6304d8e9afb4ee399569e9858ce73c80a Mon Sep 17 00:00:00 2001 From: Edgar Date: Sat, 4 Sep 2021 16:04:16 +0000 Subject: [PATCH] :bug: Fixed OGRE 13 build --- ogre/13/conandata.yml | 1 + ogre/13/conanfile.py | 2 ++ ogre/13/patches/13.0.0/FixFindOpenGLES2.cmake.patch | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 ogre/13/patches/13.0.0/FixFindOpenGLES2.cmake.patch diff --git a/ogre/13/conandata.yml b/ogre/13/conandata.yml index 3869cac..e1c79c4 100644 --- a/ogre/13/conandata.yml +++ b/ogre/13/conandata.yml @@ -10,6 +10,7 @@ patches: - patch_file: "patches/13.0.0/CMakeLists.txt.patch" - patch_file: "patches/13.0.0/pugixml-fix.patch" - patch_file: "patches/13.0.0/FindPkgMacros.cmake.patch" + - patch_file: "patches/13.0.1/FixFindOpenGLES2.cmake.patch" "13.0.1": - patch_file: "patches/13.0.1/CMakeLists.txt.patch" - patch_file: "patches/13.0.1/pugixml-fix.patch" diff --git a/ogre/13/conanfile.py b/ogre/13/conanfile.py index ece447e..affbc1f 100644 --- a/ogre/13/conanfile.py +++ b/ogre/13/conanfile.py @@ -30,6 +30,8 @@ class OGREConan(ConanFile): def build(self): cmake = CMake(self) cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_COPY_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_INSTALL_DEPENDENCIES"] = "OFF" cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" diff --git a/ogre/13/patches/13.0.0/FixFindOpenGLES2.cmake.patch b/ogre/13/patches/13.0.0/FixFindOpenGLES2.cmake.patch new file mode 100644 index 0000000..9986338 --- /dev/null +++ b/ogre/13/patches/13.0.0/FixFindOpenGLES2.cmake.patch @@ -0,0 +1,11 @@ +--- CMake/Packages/FindOpenGLES2.cmake ++++ CMake/Packages/FindOpenGLES2.cmake +@@ -23,6 +23,8 @@ + # EGL_INCLUDE_DIR - the EGL include directory + # EGL_LIBRARIES - Link these to use EGL + ++include(FindPkgMacros) ++ + IF(APPLE) + create_search_paths(/Developer/Platforms) + findpkg_framework(OpenGLES2)