|
@@ -27,7 +27,7 @@ macro(upm_SWIG_PYTHON)
|
27
|
27
|
)
|
28
|
28
|
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pyupm_${libname}.so
|
29
|
29
|
${CMAKE_CURRENT_BINARY_DIR}/pyupm_${libname}.py
|
30
|
|
- DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/
|
|
30
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/
|
31
|
31
|
COMPONENT ${libname})
|
32
|
32
|
endif()
|
33
|
33
|
endmacro()
|
|
@@ -114,7 +114,7 @@ macro(upm_module_init)
|
114
|
114
|
if (BUILDDOC)
|
115
|
115
|
upm_doxygen()
|
116
|
116
|
endif()
|
117
|
|
- install (TARGETS ${libname} DESTINATION lib COMPONENT ${libname})
|
|
117
|
+ install(TARGETS ${libname} DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
|
118
|
118
|
install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname})
|
119
|
119
|
|
120
|
120
|
if (IPK)
|