mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 16:29:07 +08:00
5eae23f558
* [azure-kinect-sensor-sdk] fix linux build and other issues
- linux: warnings stopping the build
- linux: set correct casing for dependecies
- linux: depthengine
- upgrade to 1.4.1
* Update ports/azure-kinect-sensor-sdk/CONTROL
* Update ports/azure-kinect-sensor-sdk/portfile.cmake
* Force to re-download archive, revert 9cd44db8e3
* update version record
* Update ports/azure-kinect-sensor-sdk/CONTROL
* Update versions/a-/azure-kinect-sensor-sdk.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 672f6e2..555cb8f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -109,19 +109,23 @@ find_library(JPEG_TURBO turbojpeg REQUIRED)
|
|
find_package(Matroska CONFIG REQUIRED)
|
|
add_definitions(-DMATROSKA_VERSION=2)
|
|
find_package(libsoundio CONFIG REQUIRED)
|
|
-find_package(libusb CONFIG REQUIRED)
|
|
-find_package(libuvc CONFIG REQUIRED)
|
|
+if (NOT WIN32)
|
|
+ find_package(libusb CONFIG REQUIRED)
|
|
+ find_package(libuvc CONFIG REQUIRED)
|
|
+ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
|
|
+ find_package(OpenSSL REQUIRED)
|
|
+ find_package(ZLIB REQUIRED)
|
|
+ add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED)
|
|
+ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR})
|
|
+ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES})
|
|
+else()
|
|
+ find_library(LibUSB libusb-1.0 REQUIRED)
|
|
+endif()
|
|
find_package(libyuv CONFIG REQUIRED)
|
|
find_package(spdlog CONFIG REQUIRED)
|
|
-find_package(OpenSSL REQUIRED)
|
|
-find_package(ZLIB REQUIRED)
|
|
if (BUILD_TOOLS)
|
|
find_package(gl3w CONFIG REQUIRED)
|
|
endif()
|
|
-add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
|
|
-add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED)
|
|
-set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR})
|
|
-set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES})
|
|
# add jpeg-turbo library to jpeg libraries.
|
|
set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO})
|
|
# Fix embl error
|