From 48a69892efb0b88373fc44cdb388a54171a29668 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 23 Sep 2024 11:04:03 +0100 Subject: [PATCH 1/2] Update external/windows to latest version --- external/windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/windows b/external/windows index c55d398080..eddef81835 160000 --- a/external/windows +++ b/external/windows @@ -1 +1 @@ -Subproject commit c55d3980808da97306e2b4feac452323854a39e4 +Subproject commit eddef8183524e5aaef978088427d4b22a5afb393 From 5a38bdf0b5d35b7ce6084338b3fc9ed74dbb4d14 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 23 Sep 2024 11:55:54 +0100 Subject: [PATCH 2/2] Use opencv4 with VS2022 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ec925d53d..2af5a4045e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,7 +347,7 @@ elseif (WIN32) set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll/libusb-1.0.lib" CACHE INTERNAL "") set(LIBUSB_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll" CACHE INTERNAL "") -if(VS2019) + if(VS2022 OR VS2019) set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv4" CACHE INTERNAL "") else() set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "")