alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake : Define library suffix in case of 64 bits multilib archs in linux

Browse Source 
Install library using cmake defined library directories. Install python
packages using cmake defined library directories

Signed-off-by: Helio Chisisni de Castro <helio@kde.org>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Helio Chissini de Castro 2014-12-01 10:21:49 -02:00 committed by Brendan Le Foll
parent e04a6fbcaa
commit cb37c87467
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -14,6 +14,10 @@ message (INFO " found libmraa version: ${MRAA_VERSION}")
# Appends the cmake/modules path to MAKE_MODULE_PATH variable. # Appends the cmake/modules path to MAKE_MODULE_PATH variable.
set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) 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. # Make a version file containing the current version from git.
include (GetGitRevisionDescription) include (GetGitRevisionDescription)

4
src/CMakeLists.txt
View File

@ -27,7 +27,7 @@ macro(upm_SWIG_PYTHON)
) )
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pyupm_${libname}.so install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pyupm_${libname}.so
${CMAKE_CURRENT_BINARY_DIR}/pyupm_${libname}.py ${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}) COMPONENT ${libname})
endif() endif()
endmacro() endmacro()
@ -114,7 +114,7 @@ macro(upm_module_init)
if (BUILDDOC) if (BUILDDOC)
upm_doxygen() upm_doxygen()
endif() 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}) install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname})
if (IPK) if (IPK)