From fecae6ab1b1aa36f43b5cd87b229de4df37e44ab Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 30 Dec 2024 10:41:53 +0100 Subject: [PATCH] CMake: Yield error if VCPKG_ROOT variable is missing ...and vcpkg usage was requested. The user got no further feedback why vcpkg wasn't used despite passing the -vcpkg configure argument. Pick-to: 6.8 6.9 Change-Id: Ib43c2045f093c3887a63406e37f37bdd681341cd Reviewed-by: Alexey Edelev --- cmake/QtAutoDetectHelpers.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QtAutoDetectHelpers.cmake b/cmake/QtAutoDetectHelpers.cmake index a3fe523f96b..bffcfb9de46 100644 --- a/cmake/QtAutoDetectHelpers.cmake +++ b/cmake/QtAutoDetectHelpers.cmake @@ -152,7 +152,12 @@ function(qt_auto_detect_android) endfunction() function(qt_auto_detect_vcpkg) - if(QT_USE_VCPKG AND DEFINED ENV{VCPKG_ROOT}) + if(QT_USE_VCPKG) + if(NOT DEFINED ENV{VCPKG_ROOT}) + message(FATAL_ERROR + "Usage of vcpkg was requested but the environment variable VCPKG_ROOT is not set." + ) + endif() set(vcpkg_toolchain_file "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake") get_filename_component(vcpkg_toolchain_file "${vcpkg_toolchain_file}" ABSOLUTE)