diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs/libuvc/files | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'media-libs/libuvc/files')
| -rw-r--r-- | media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch new file mode 100644 index 000000000000..e7ac5d7268fc --- /dev/null +++ b/media-libs/libuvc/files/libuvc-0.0.6-GNUInstallDirs.patch @@ -0,0 +1,36 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ + + SET(CMAKE_C_FLAGS_DEBUG "-g -DUVC_DEBUGGING") + +-SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libuvc" CACHE PATH ++SET(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libuvc" CACHE PATH + "Installation directory for CMake files") + + SET(SOURCES src/ctrl.c src/ctrl-gen.c src/device.c src/diag.c +@@ -110,18 +110,18 @@ + + install(TARGETS ${UVC_TARGETS} + EXPORT libuvcTargets +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" +- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libuvc" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libuvc" + ) + + export(TARGETS ${UVC_TARGETS} + FILE "${PROJECT_BINARY_DIR}/libuvcTargets.cmake") + export(PACKAGE libuvc) + +-set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include") +-set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") +-set(CONF_LIBRARY "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}") ++set(CONF_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(CONF_LIBRARY_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++set(CONF_LIBRARY "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}uvc${CMAKE_SHARED_LIBRARY_SUFFIX}") + + configure_file(libuvcConfig.cmake.in ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libuvcConfig.cmake) + |