From 577a72748f7229dba039309fc1da15b91654c95d Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Sun, 6 Feb 2022 13:30:39 +0200 Subject: [PATCH] qt: make qt dependencies a feature in vcpkg so they are not included if building non-qt --- CMakeLists.txt | 4 ++++ vcpkg.json | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecbb4ca6b..b8635cdc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,10 @@ cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0091 NEW) cmake_policy(SET CMP0079 NEW) +if (QT) + list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui") +endif() + project(86Box VERSION 3.2 DESCRIPTION "Emulator of x86-based systems" diff --git a/vcpkg.json b/vcpkg.json index bc7c7c524..f4e78d8e7 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,14 +3,21 @@ "version-string": "3.1", "homepage": "https://86box.net/", "documentation": "http://86box.readthedocs.io/", - "license": "GPL-2.0-only", + "license": "GPL-2.0-or-later", "dependencies": [ "freetype", "libpng", "openal-soft", "sdl2", - "rtmidi", - "qt5-base", - "qt5-translations" - ] + "rtmidi" + ], + "features": { + "qt-ui": { + "description": "Qt User Interface", + "dependencies": [ + "qt5-base", + "qt5-translations" + ] + } + } }