--- 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)