From ac2ddd5f059b56b6e0b9fc0c73bd4feccad539ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sun, 25 Oct 2020 22:08:56 -0700 Subject: [PATCH] [ogre] Temporary disable dependency qt (#14226) --- ports/ogre/disable-dependency-qt.patch | 14 ++++++++++++++ ports/ogre/portfile.cmake | 1 + ports/ogre/vcpkg.json | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ports/ogre/disable-dependency-qt.patch diff --git a/ports/ogre/disable-dependency-qt.patch b/ports/ogre/disable-dependency-qt.patch new file mode 100644 index 0000000000..f97bd256b7 --- /dev/null +++ b/ports/ogre/disable-dependency-qt.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index 068dd27..721121b 100644 +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -346,7 +346,9 @@ if(NOT ANDROID AND NOT EMSCRIPTEN) + ) + endif() + ++ if (0) + find_package(Qt5 COMPONENTS Core Gui QUIET) ++ endif() + macro_log_feature(Qt5_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/" FALSE "" "") + endif() + diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index fac3cbdf2f..76de8a4834 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( toolchain_fixes.patch fix-dependency.patch fix-findimgui.patch + disable-dependency-qt.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index c3d81afa89..453cb363eb 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 1, + "port-version": 2, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [