From f4faf7c0266e405e9d7de1cf496634584371f337 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 19 Aug 2020 18:05:23 -0300 Subject: [PATCH] Fix install folder for libuvc --- recipes/libuvc/all/conandata.yml | 2 ++ .../all/patches/0002-adjust-install-folder.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 recipes/libuvc/all/patches/0002-adjust-install-folder.patch diff --git a/recipes/libuvc/all/conandata.yml b/recipes/libuvc/all/conandata.yml index f62deb82b3756..2a11d1f42776b 100644 --- a/recipes/libuvc/all/conandata.yml +++ b/recipes/libuvc/all/conandata.yml @@ -6,3 +6,5 @@ patches: "0.0.6": - patch_file: "patches/0001-adjust-libusb.patch" base_path: "source_subfolder" + - patch_file: "patches/0002-adjust-install-folder.patch" + base_path: "source_subfolder" diff --git a/recipes/libuvc/all/patches/0002-adjust-install-folder.patch b/recipes/libuvc/all/patches/0002-adjust-install-folder.patch new file mode 100644 index 0000000000000..6f0177f681d0a --- /dev/null +++ b/recipes/libuvc/all/patches/0002-adjust-install-folder.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 581a308..c3ccfa2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,8 +93,9 @@ endif() + + install(TARGETS ${UVC_TARGETS} + EXPORT libuvcTargets +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" ++ LIBRARY DESTINATION "lib" ++ ARCHIVE DESTINATION "lib" ++ RUNTIME DESTINATION "bin" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libuvc" + ) +