Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame^] | 1 | From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Dec 2019 23:37:40 -0800 |
| 4 | Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path |
| 5 | |
| 6 | Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++----- |
| 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 13 | |
| 14 | diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake |
| 15 | index 2d7102f..55e78f8 100644 |
| 16 | --- a/src/libcec/cmake/CheckPlatformSupport.cmake |
| 17 | +++ b/src/libcec/cmake/CheckPlatformSupport.cmake |
| 18 | @@ -224,16 +224,16 @@ else() |
| 19 | |
| 20 | if (${PYTHON_MAJOR_VERSION} EQUAL 2) |
| 21 | install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} |
| 22 | - DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) |
| 23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec) |
| 24 | install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py |
| 25 | - DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) |
| 26 | + DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) |
| 27 | install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py |
| 28 | - DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) |
| 29 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec) |
| 30 | else() |
| 31 | install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} |
| 32 | - DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) |
| 33 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}) |
| 34 | install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py |
| 35 | - DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) |
| 36 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}) |
| 37 | endif() |
| 38 | endif() |
| 39 | endif() |
| 40 | -- |
| 41 | 2.24.1 |
| 42 | |