From 6ce1b1c4ce3cfd092148649012caeb0c8e072356 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Tue, 25 Oct 2016 12:15:05 +0100 Subject: [PATCH] python: remove temporary RPATH from _mraa.so when installing Signed-off-by: Mihai Tudor Panu Signed-off-by: Brendan Le Foll --- src/python/python2/CMakeLists.txt | 10 +++++++--- src/python/python3/CMakeLists.txt | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/python/python2/CMakeLists.txt b/src/python/python2/CMakeLists.txt index 79d8daa..8c48c39 100644 --- a/src/python/python2/CMakeLists.txt +++ b/src/python/python2/CMakeLists.txt @@ -25,9 +25,13 @@ if (PYTHON2_LIBRARY) COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DSWIGPYTHON2=${SWIG_FOUND}" ) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_mraa${CMAKE_SHARED_LIBRARY_SUFFIX} - ${CMAKE_CURRENT_BINARY_DIR}/mraa.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}) + install (TARGETS ${SWIG_MODULE_python2-mraa_REAL_NAME} + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH} + ) + + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH} + ) endif() add_subdirectory (docs) diff --git a/src/python/python3/CMakeLists.txt b/src/python/python3/CMakeLists.txt index 068605f..6c3846b 100644 --- a/src/python/python3/CMakeLists.txt +++ b/src/python/python3/CMakeLists.txt @@ -18,7 +18,11 @@ if (PYTHON3_LIBRARY) COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DDSWIGPYTHON3=${SWIG_FOUND}" ) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_mraa${CMAKE_SHARED_LIBRARY_SUFFIX} - ${CMAKE_CURRENT_BINARY_DIR}/mraa.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}) + install (TARGETS ${SWIG_MODULE_python3-mraa_REAL_NAME} + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH} + ) + + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH} + ) endif ()