mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 01:48:59 +08:00
4c366a7914
- [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --------- Co-authored-by: Kai Pastor <dg0yt@darc.de>
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fbaffc9..672ebb9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -5,7 +5,6 @@ project(libuvc
|
|
)
|
|
|
|
# Additional search scripts path for libusb-1.0, libjpeg, OpenCV
|
|
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
|
|
|
|
# Xcode and Visual Studio do not using CMAKE_BUILD_TYPE cache variable
|
|
# so we use Release build type only with single configuration generators.
|
|
@@ -39,10 +38,11 @@ set(SOURCES
|
|
src/misc.c
|
|
)
|
|
|
|
-find_package(LibUSB)
|
|
+FIND_PACKAGE(PkgConfig REQUIRED)
|
|
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
|
|
|
|
# JpegPkg name to differ from shipped with CMake
|
|
-find_package(JpegPkg QUIET)
|
|
+find_package(JPEG REQUIRED)
|
|
if(JPEG_FOUND)
|
|
message(STATUS "Building libuvc with JPEG support.")
|
|
set(LIBUVC_HAS_JPEG TRUE)
|
|
@@ -116,8 +116,11 @@ foreach(target_name IN LISTS UVC_TARGETS)
|
|
)
|
|
target_link_libraries(${target_name}
|
|
# libusb-1.0 used internally so we link to it privately.
|
|
- PRIVATE LibUSB::LibUSB ${threads}
|
|
+ PRIVATE PkgConfig::libusb ${threads}
|
|
)
|
|
+ if(APPLE)
|
|
+ target_link_libraries(${target_name} PRIVATE "-framework IOKit" "-framework CoreFoundation" "-framework Security")
|
|
+ endif()
|
|
if(JPEG_FOUND)
|
|
target_link_libraries(${target_name}
|
|
PRIVATE JPEG::JPEG
|
|
@@ -191,12 +194,6 @@ install(EXPORT libuvcTargets
|
|
DESTINATION ${CMAKE_INSTALL_CMAKEDIR}
|
|
)
|
|
|
|
-install(FILES
|
|
- cmake/FindLibUSB.cmake
|
|
- cmake/FindJpegPkg.cmake
|
|
- DESTINATION ${CMAKE_INSTALL_CMAKEDIR}
|
|
-)
|
|
-
|
|
include(CMakePackageConfigHelpers)
|
|
write_basic_package_version_file(libuvcConfigVersion.cmake
|
|
COMPATIBILITY AnyNewerVersion
|
|
diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake
|
|
index b9887ea..c704ab5 100644
|
|
--- a/libuvcConfig.cmake
|
|
+++ b/libuvcConfig.cmake
|
|
@@ -10,8 +10,11 @@ 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})
|
|
+find_dependency(Threads)
|
|
+find_package(PkgConfig REQUIRED)
|
|
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
|
|
include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake")
|
|
|
|
set(libuvc_FOUND TRUE)
|