]>
Commit | Line | Data |
---|---|---|
b47f8710 JR |
1 | --- openwsman-2.6.2/src/plugins/swig/python/CMakeLists.txt~ 2015-10-19 15:27:46.000000000 +0200 |
2 | +++ openwsman-2.6.2/src/plugins/swig/python/CMakeLists.txt 2015-12-31 16:50:25.747677518 +0100 | |
3 | @@ -9,7 +9,7 @@ | |
4 | ||
5 | FIND_PACKAGE(PythonInterp REQUIRED) | |
6 | ||
7 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) | |
8 | +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(plat_specific=True,prefix='/usr'))" OUTPUT_VARIABLE PYTHON_LIB_DIR) | |
9 | ||
10 | IF (NOT PYTHON_SITE_DIR) | |
11 | SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR}) | |
83504ec0 JB |
12 | --- openwsman-2.6.5/bindings/python/CMakeLists.txt.orig 2017-11-28 09:32:15.000000000 +0100 |
13 | +++ openwsman-2.6.5/bindings/python/CMakeLists.txt 2018-09-03 21:47:58.258854144 +0200 | |
14 | @@ -13,9 +13,9 @@ | |
b47f8710 JR |
15 | add_subdirectory(tests) |
16 | ||
83504ec0 JB |
17 | set(Python_ADDITIONAL_VERSIONS 3.6 3.5 2.7 2.6) |
18 | +FIND_PACKAGE(PythonInterp REQUIRED) | |
19 | FIND_PACKAGE(PythonLibs) | |
20 | IF (PYTHON_LIBRARY) | |
21 | - FIND_PACKAGE(PythonInterp REQUIRED) | |
22 | #MESSAGE(STATUS "Found PythonLibs...") | |
23 | FIND_PACKAGE(PythonLinkLibs) | |
24 | #IF (PYTHON_LINK_LIBS) | |
25 | @@ -25,7 +25,7 @@ | |
26 | MESSAGE(STATUS "No Python found") | |
27 | ENDIF (PYTHON_LIBRARY) | |
28 | ||
b97ca65a JB |
29 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) |
30 | +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True,prefix='/usr'))" OUTPUT_VARIABLE PYTHON_LIB_DIR) | |
b47f8710 JR |
31 | STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}") |
32 | ||
33 | MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") |