From 137f03b9a34fb39e5321524ab11fa31276458476 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Tue, 29 Oct 2013 09:05:51 +0100 Subject: Use ConfigurePaths to get installation paths The advantage is twofold: 1) we have a clear separation between setting up the paths and actually using them, 2) the interface is very likely as configure scripts and makes integration into build system a bit easier. --- plugins/dexela/CMakeLists.txt | 2 +- plugins/mock/CMakeLists.txt | 2 +- plugins/pco/CMakeLists.txt | 2 +- plugins/pf/CMakeLists.txt | 2 +- plugins/pylon/CMakeLists.txt | 2 +- plugins/ufo/CMakeLists.txt | 2 +- plugins/xkit/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index 9079565..d497f7d 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -24,6 +24,6 @@ if (DEXELA_FOUND) target_link_libraries(ucadexela ${UCA_DEPS} ${DEXELA_LIBRARIES}) install(TARGETS ucadexela - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif() diff --git a/plugins/mock/CMakeLists.txt b/plugins/mock/CMakeLists.txt index bf6ed29..3dac582 100644 --- a/plugins/mock/CMakeLists.txt +++ b/plugins/mock/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(ucamock ${UCA_DEPS}) install(TARGETS ucamock - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt index 7e10320..ea28c2f 100644 --- a/plugins/pco/CMakeLists.txt +++ b/plugins/pco/CMakeLists.txt @@ -35,6 +35,6 @@ if (PCO_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND) ${FGLIB5_LIBRARY}) install(TARGETS ucapco - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif() diff --git a/plugins/pf/CMakeLists.txt b/plugins/pf/CMakeLists.txt index 766f557..a384ae8 100644 --- a/plugins/pf/CMakeLists.txt +++ b/plugins/pf/CMakeLists.txt @@ -28,6 +28,6 @@ if (PF_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND) ${FGLIB5_LIBRARY}) install(TARGETS ucapf - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif() diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 7b67167..0e9088d 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -18,6 +18,6 @@ if (PYLON_FOUND) ${LIBPYLONCAM_LIBRARIES}) install(TARGETS ucapylon - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif() diff --git a/plugins/ufo/CMakeLists.txt b/plugins/ufo/CMakeLists.txt index b85504a..b3372d4 100644 --- a/plugins/ufo/CMakeLists.txt +++ b/plugins/ufo/CMakeLists.txt @@ -22,6 +22,6 @@ if (IPE_FOUND) ${IPE_LIBRARIES}) install(TARGETS ucaufo - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif() diff --git a/plugins/xkit/CMakeLists.txt b/plugins/xkit/CMakeLists.txt index 209ef34..b82881e 100644 --- a/plugins/xkit/CMakeLists.txt +++ b/plugins/xkit/CMakeLists.txt @@ -27,6 +27,6 @@ if (XKIT_INCLUDE_DIR AND XKIT_LIBRARIES) ${XKIT_LIBRARIES}) install(TARGETS ucaxkit - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca + LIBRARY DESTINATION ${UCA_PLUGINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif () -- cgit v1.2.3