From cb37c874676e9fb4be88dd613f92aa709542c353 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 1 Dec 2014 10:21:49 -0200 Subject: [PATCH] cmake : Define library suffix in case of 64 bits multilib archs in linux Install library using cmake defined library directories. Install python packages using cmake defined library directories Signed-off-by: Helio Chisisni de Castro Signed-off-by: Brendan Le Foll --- CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37a43168..1ffaa23a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,10 @@ message (INFO " found libmraa 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 CMAKE_LIB_INSTALL_DIR if not defined +include(GNUInstallDirs) # Make a version file containing the current version from git. include (GetGitRevisionDescription) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 83907e95..758291b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,7 +27,7 @@ macro(upm_SWIG_PYTHON) ) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pyupm_${libname}.so ${CMAKE_CURRENT_BINARY_DIR}/pyupm_${libname}.py - DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/ + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/ COMPONENT ${libname}) endif() endmacro() @@ -114,7 +114,7 @@ macro(upm_module_init) if (BUILDDOC) upm_doxygen() endif() - install (TARGETS ${libname} DESTINATION lib COMPONENT ${libname}) + install(TARGETS ${libname} DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname}) if (IPK)