| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 19 Mar 2022 23:16:51 -0700 |
| 4 | Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in |
| 5 | cmake |
| 6 | |
| 7 | This ensures that it gets installed in platform specified system libdir |
| 8 | all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 |
| 9 | |
| 10 | Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | pyiec61850/CMakeLists.txt | 6 ++++-- |
| 14 | 1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | --- a/pyiec61850/CMakeLists.txt |
| 17 | +++ b/pyiec61850/CMakeLists.txt |
| 18 | @@ -31,7 +31,9 @@ endif() |
| 19 | |
| 20 | swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) |
| 21 | |
| 22 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) |
| 23 | -install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) |
| 24 | +include(GNUInstallDirs) |
| 25 | + |
| 26 | +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) |
| 27 | +install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) |
| 28 | |
| 29 | add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) |