From 7f818c1e29d66ab335b3c232f60ae4b7899a9913 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Tue, 4 Apr 2017 12:51:13 +0200 Subject: Use GNUInstallDirs to set install paths --- src/CMakeLists.txt | 12 ++++++------ src/config.h.in | 2 +- src/libuca.pc.in | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eab0f9c..e5c4ab7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,25 +113,25 @@ endif() #}}} #{{{ Installation install(TARGETS uca - LIBRARY DESTINATION ${UCA_LIBDIR} - RUNTIME DESTINATION ${UCA_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libuca.pc - DESTINATION ${UCA_PKGCONFIGDIR} + DESTINATION ${CMAKE_INSTALL_PKGCONFIGDIR} COMPONENT libraries) install(FILES ${uca_HDRS} - DESTINATION ${UCA_INCLUDEDIR}/uca + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/uca COMPONENT headers) if(WITH_GIR) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_XML} - DESTINATION ${UCA_GIRDIR} + DESTINATION ${CMAKE_INSTALL_GIRDIR} COMPONENT libraries) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_TYPELIB} - DESTINATION ${UCA_TYPELIBDIR} + DESTINATION ${CMAKE_INSTALL_TYPELIBDIR} COMPONENT libraries) endif() #}}} diff --git a/src/config.h.in b/src/config.h.in index 8b11c60..4cceee4 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -6,4 +6,4 @@ #cmakedefine HAVE_PYLON_CAMERA #cmakedefine HAVE_DEXELA_CL #cmakedefine HAVE_MOCK_CAMERA -#cmakedefine UCA_PLUGINDIR "${UCA_PLUGINDIR}" +#define UCA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_PLUGINDIR}" diff --git a/src/libuca.pc.in b/src/libuca.pc.in index cd3f58c..c660a0f 100644 --- a/src/libuca.pc.in +++ b/src/libuca.pc.in @@ -1,10 +1,10 @@ -prefix=@UCA_PREFIX@ -exec_prefix=@UCA_EPREFIX@ -libdir=@UCA_LIBDIR@ -includedir=@UCA_INCLUDEDIR@ -girdir=@UCA_GIRDIR@ -typelibdir=@UCA_TYPELIBDIR@ -plugindir=@UCA_PLUGINDIR@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +girdir=${prefix}/@CMAKE_INSTALL_GIRDIR@ +typelibdir=${exec_prefix}/@CMAKE_INSTALL_TYPELIBDIR@ +plugindir=${exec_prefix}/@CMAKE_INSTALL_PLUGINDIR@ Name: libuca Description: @UCA_DESCRIPTION@ -- cgit v1.2.3