mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-15 12:51:49 -05:00
Merge pull request #2257 from srcejon/opencv_update
Update external/windows to latest version of sdrangel-windows-libraries
This commit is contained in:
commit
1a55e32865
@ -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 "")
|
||||
|
2
external/windows
vendored
2
external/windows
vendored
@ -1 +1 @@
|
||||
Subproject commit c55d3980808da97306e2b4feac452323854a39e4
|
||||
Subproject commit eddef8183524e5aaef978088427d4b22a5afb393
|
Loading…
Reference in New Issue
Block a user