diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-09-11 04:41:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 13:41:46 -0700 |
| commit | e8e660a36c6aabc788d0cb03c5b38b7df6edbb22 (patch) | |
| tree | 4efcd3b6e85e33e451321d39fe3229398aaf86d0 /ports/libuvc/build_fix.patch | |
| parent | e0aee0ddcfdab86b4f7d28371f7923fa948599d3 (diff) | |
| download | vcpkg-e8e660a36c6aabc788d0cb03c5b38b7df6edbb22.tar.gz vcpkg-e8e660a36c6aabc788d0cb03c5b38b7df6edbb22.zip | |
[vcpkg baseline][pangolin] Add features, fix dependency pybind11 (#20006)
* [vcpkg baseline][pangolin] Add features, fix dependency pybind11
* Fix dependency name realsense2
* Remove default-feature gles
* Re-generated patch, add MAYBE_UNUSED_VARIABLES, fix build with core
* version
* Fix desc, add more MAYBE_UNUSED_VARIABLES
* version
* more MAYBE_UNUSED_VARIABLES
* version
* Remove some CMAKE_DISABLE_FIND_PACKAGE_*
* version
* Remove more CMAKE_DISABLE_FIND_* since they are disabled
* Remove BUILD_FOR_GLES_2
* version
* Restore BUILD_FOR_GLES_2
* version
* Fix more dependencies
* [libuvc]Fix build type, fix usage
* version
* Re-make patch
* version
* Use libjpeg macros instead of target name to avoid use `find_dependency`
* version
* Fix usage on non-Windows
* version
* commit suggestions
* version
* Apply suggestion
* version
* Re-fix JPEG
* version
* typo
* format
* version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/libuvc/build_fix.patch')
| -rw-r--r-- | ports/libuvc/build_fix.patch | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/ports/libuvc/build_fix.patch b/ports/libuvc/build_fix.patch index 8ef3d9217..3c5bfcd44 100644 --- a/ports/libuvc/build_fix.patch +++ b/ports/libuvc/build_fix.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3c8116..0da84a7 100644 +index f3c8116..b9a6d38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ set(SOURCES +@@ -39,10 +39,10 @@ set(SOURCES src/misc.c ) @@ -10,7 +10,11 @@ index f3c8116..0da84a7 100644 +find_package(libusb CONFIG REQUIRED) # JpegPkg name to differ from shipped with CMake - find_package(JpegPkg QUIET) +-find_package(JpegPkg QUIET) ++find_package(JPEG REQUIRED) + if(JPEG_FOUND) + message(STATUS "Building libuvc with JPEG support.") + set(LIBUVC_HAS_JPEG TRUE) @@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS) $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> $<INSTALL_INTERFACE:include> @@ -23,3 +27,18 @@ index f3c8116..0da84a7 100644 ) if(JPEG_FOUND) target_link_libraries(${target_name} +diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake +index b9887ea..e8f09dc 100644 +--- a/libuvcConfig.cmake ++++ b/libuvcConfig.cmake +@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) + list(APPEND extraArgs REQUIRED) + endif() + +-find_package(JpegPkg ${extraArgs}) +-find_package(LibUSB ${extraArgs}) ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG ${extraArgs}) + include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake") + + set(libuvc_FOUND TRUE) |