From 6e2355ce9afc98cbeb0c7c2edca25cf471f8a6fe Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Thu, 29 Oct 2015 14:54:21 -0700 Subject: [PATCH] cmake: use cmake libdir Signed-off-by: Kevron Rees Signed-off-by: Mihai Tudor Panu --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0afb94c..92b3545b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ message (INFO " found mraa version: ${MRAA_VERSION}") # Appends the cmake/modules path to MAKE_MODULE_PATH variable. set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) -set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") +set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") # Set CMAKE_LIB_INSTALL_DIR if not defined include(GNUInstallDirs) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8c26ede4..092b6ecc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -184,7 +184,7 @@ macro(upm_module_init) SOVERSION ${upm_VERSION_MAJOR} VERSION ${upm_VERSION_STRING} ) - upm_create_install_pkgconfig (upm-${libname}.pc lib${LIB_SUFFIX}/pkgconfig) + upm_create_install_pkgconfig (upm-${libname}.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) if (SWIG_FOUND) upm_swig_python() upm_swig_node()