diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch deleted file mode 100644 index 3f0490cb80..0000000000 --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Romain Naour <romain.naour@smile.fr> | ||
| 3 | Date: Fri, 10 Jul 2020 17:08:34 +0200 | ||
| 4 | Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find | ||
| 5 | python modules install path (site-packages) | ||
| 6 | |||
| 7 | https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake | ||
| 8 | |||
| 9 | Signed-off-by: Romain Naour <romain.naour@smile.fr> | ||
| 10 | --- | ||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | pyiec61850/CMakeLists.txt | 11 ++--------- | ||
| 14 | 1 file changed, 2 insertions(+), 9 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt | ||
| 17 | index 159ef4b..d1732a1 100644 | ||
| 18 | --- a/pyiec61850/CMakeLists.txt | ||
| 19 | +++ b/pyiec61850/CMakeLists.txt | ||
| 20 | @@ -31,14 +31,7 @@ endif() | ||
| 21 | |||
| 22 | swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) | ||
| 23 | |||
| 24 | -# Finding python modules install path | ||
| 25 | -execute_process( | ||
| 26 | - COMMAND ${PYTHON_EXECUTABLE} -c | ||
| 27 | - "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" | ||
| 28 | - OUTPUT_VARIABLE PYTHON_SITE_DIR | ||
| 29 | -) | ||
| 30 | - | ||
| 31 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) | ||
| 32 | -install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) | ||
| 33 | +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) | ||
| 34 | +install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) | ||
| 35 | |||
| 36 | add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) | ||
| 37 | -- | ||
| 38 | 2.31.1 | ||
| 39 | |||
