From 3d293bac6a976d8a6376a51f3ef37cacc77ee990 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Mon, 5 Sep 2022 09:21:17 +0200 Subject: [PATCH] cmake: Require nlohmann-json when building the front-end Nlohmann-json is used in the about dialog, yet wasn't required when building the front-end, leading to failing compilation. This ensures that it is correctly required. --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eda960..9fe7672 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2017 Michael Fabian Dirks +# Copyright (C) 2022 Romain Vigier # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -653,10 +654,14 @@ function(feature_frontend RESOLVE) elseif(NOT obs-frontend-api_FOUND) message(WARNING "${LOGPREFIX}Front-End requires OBS FrontEnd API. Disabling...") set_feature_disabled(FRONTEND ON) + elseif(NOT HAVE_JSON) + message(WARNING "${LOGPREFIX}Front-End requires nlohmann::json. Disabling...") + set_feature_disabled(FRONTEND ON) endif() elseif(T_CHECK) set(REQUIRE_QT ON PARENT_SCOPE) set(REQUIRE_OBS_FRONTEND_API ON PARENT_SCOPE) + set(REQUIRE_JSON ON PARENT_SCOPE) endif() endfunction()