aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-10-25 22:08:56 -0700
committerGitHub <noreply@github.com>2020-10-25 22:08:56 -0700
commitac2ddd5f059b56b6e0b9fc0c73bd4feccad539ff (patch)
treec786e54754b1bedc34739c0e66c8da1abe4c7e40
parentba7fd714f2ea59d7cde560728ad8e57a2381895f (diff)
downloadvcpkg-ac2ddd5f059b56b6e0b9fc0c73bd4feccad539ff.tar.gz
vcpkg-ac2ddd5f059b56b6e0b9fc0c73bd4feccad539ff.zip
[ogre] Temporary disable dependency qt (#14226)
-rw-r--r--ports/ogre/disable-dependency-qt.patch14
-rw-r--r--ports/ogre/portfile.cmake1
-rw-r--r--ports/ogre/vcpkg.json2
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/ogre/disable-dependency-qt.patch b/ports/ogre/disable-dependency-qt.patch
new file mode 100644
index 000000000..f97bd256b
--- /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 fac3cbdf2..76de8a483 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 c3d81afa8..453cb363e 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": [