Merge pull request #2257 from srcejon/opencv_update

Update external/windows to latest version of sdrangel-windows-libraries
Use opencv4 with VS2022
2024-11-24 00:48:41 -05:00 · 2024-09-23 16:41:34 +02:00 · 2024-09-23 11:55:54 +01:00 · 2024-09-23 11:04:03 +01:00
2 changed files with 2 additions and 2 deletions
--- 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 "")
--- a/external/windows
+++ b/external/windows
@ -1 +1 @@
-Subproject commit c55d3980808da97306e2b4feac452323854a39e4
+Subproject commit eddef8183524e5aaef978088427d4b22a5afb393
Author	SHA1	Message	Date
Edouard Griffiths	1a55e32865	Merge pull request #2257 from srcejon/opencv_update Update external/windows to latest version of sdrangel-windows-libraries	2024-09-23 16:41:34 +02:00
Jon Beniston	5a38bdf0b5	Use opencv4 with VS2022	2024-09-23 11:55:54 +01:00
Jon Beniston	48a69892ef	Update external/windows to latest version	2024-09-23 11:04:03 +01:00