Your Name
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 19 Mar 2022 23:16:51 -0700
|
|
Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in
|
|
cmake
|
|
|
|
This ensures that it gets installed in platform specified system libdir
|
|
all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64
|
|
|
|
Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
pyiec61850/CMakeLists.txt | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/pyiec61850/CMakeLists.txt
|
|
+++ b/pyiec61850/CMakeLists.txt
|
|
@@ -31,7 +31,9 @@ endif()
|
|
|
|
swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS})
|
|
|
|
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
|
-install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
|
+include(GNUInstallDirs)
|
|
+
|
|
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
|
+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
|
|
|
add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
|