Merge pull request #3 from uilianries/libuvc-0.0.6

Fix install folder for libuvc
gocarlos · Aug 19, 2020 · 85cb41a · 85cb41a
2 parents 19613af + f4faf7c
commit 85cb41a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git 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
@@ -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"
+ )
+