|
| 1 | +diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt |
| 2 | +index 4cee36ec..0baa69ab 100644 |
| 3 | +--- a/swig/CMakeLists.txt |
| 4 | ++++ b/swig/CMakeLists.txt |
| 5 | +@@ -20,27 +20,34 @@ endif() |
| 6 | + |
| 7 | + # find Python package |
| 8 | + if(GEN_PYTHON_BINDINGS AND SWIG_FOUND) |
| 9 | +- message(STATUS "Python version ${GEN_PYTHON_VERSION} was selected") |
| 10 | +- unset(PYTHON_LIBRARY CACHE) |
| 11 | +- unset(PYTHON_EXECUTABLE CACHE) |
| 12 | +- unset(PYTHON_INCLUDE_DIR CACHE) |
| 13 | +- unset(PYTHON_LIBRARY_DEBUG CACHE) |
| 14 | +- if(${GEN_PYTHON_VERSION} STREQUAL "2") |
| 15 | +- find_package(PythonLibs 2 REQUIRED) |
| 16 | +- find_package(PythonInterp 2 REQUIRED) |
| 17 | +- if(NOT PYTHONLIBS_FOUND) |
| 18 | +- message(WARNING "Did not found Python version 2.x") |
| 19 | +- message(STATUS "Sysrepo supports Python 2.x and Python 3.x") |
| 20 | +- endif() |
| 21 | +- elseif(${GEN_PYTHON_VERSION} STREQUAL "3") |
| 22 | +- find_package(PythonLibs 3 REQUIRED) |
| 23 | +- find_package(PythonInterp 3 REQUIRED) |
| 24 | +- if(NOT PYTHONLIBS_FOUND) |
| 25 | +- message(WARNING "Did not found Python version 3.x") |
| 26 | +- message(STATUS "Sysrepo supports Python 2.x and Python 3.x") |
| 27 | +- endif() |
| 28 | ++ if(ENABLE_STATIC) |
| 29 | ++ message(WARNING "Can't create a static Python module") |
| 30 | + else() |
| 31 | +- message(WARNING "Sysrepo supports Python 2.x and Python 3.x") |
| 32 | ++ set(GEN_PYTHON_VERSION 2 3) |
| 33 | ++ foreach(CUR_PYTHON_VERSION ${GEN_PYTHON_VERSION}) |
| 34 | ++ message(STATUS "Python version ${CUR_PYTHON_VERSION} was selected") |
| 35 | ++ |
| 36 | ++ unset(PYTHON_EXECUTABLE CACHE) |
| 37 | ++ unset(PYTHON_INCLUDE_PATH CACHE) |
| 38 | ++ unset(PYTHON_EXT_SUFFIX CACHE) |
| 39 | ++ unset(PYTHON_MODULE_PATH CACHE) |
| 40 | ++ set(PYTHON_EXT_SUFFIX ".so") |
| 41 | ++ |
| 42 | ++ find_program(PYTHON_EXECUTABLE NAMES python${CUR_PYTHON_VERSION}) |
| 43 | ++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c |
| 44 | ++ "from distutils.sysconfig import get_config_var; print(get_config_var('INCLUDEPY'))" |
| 45 | ++ OUTPUT_VARIABLE PYTHON_INCLUDE_PATH |
| 46 | ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) |
| 47 | ++ #execute_process(COMMAND ${PYTHON_EXECUTABLE} -c |
| 48 | ++ # "from distutils.sysconfig import get_config_var; print(get_config_var('EXT_SUFFIX'))" |
| 49 | ++ # OUTPUT_VARIABLE PYTHON_EXT_SUFFIX |
| 50 | ++ # OUTPUT_STRIP_TRAILING_WHITESPACE ) |
| 51 | ++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c |
| 52 | ++ "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))" |
| 53 | ++ OUTPUT_VARIABLE PYTHON_MODULE_PATH |
| 54 | ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) |
| 55 | ++ add_subdirectory(python python${CUR_PYTHON_VERSION}) |
| 56 | ++ endforeach(CUR_PYTHON_VERSION) |
| 57 | + endif() |
| 58 | + endif() |
| 59 | + |
| 60 | +@@ -99,12 +106,6 @@ if (GEN_CPP_BINDINGS) |
| 61 | + endif() |
| 62 | + endif() |
| 63 | + |
| 64 | +-if(ENABLE_STATIC AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND (${GEN_PYTHON_VERSION} STREQUAL "2" OR ${GEN_PYTHON_VERSION} STREQUAL "3")) |
| 65 | +- message(WARNING "Can't create a static Python module") |
| 66 | +-elseif(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND (${GEN_PYTHON_VERSION} STREQUAL "2" OR ${GEN_PYTHON_VERSION} STREQUAL "3")) |
| 67 | +- add_subdirectory(python) |
| 68 | +-endif() |
| 69 | +- |
| 70 | + if(NOT ENABLE_STATIC AND GEN_JAVASCRIPT_BINDINGS) |
| 71 | + message(WARNING "Can't create Javascript bindings with a shared library, please use -DENABLE_STATIC") |
| 72 | + elseif(ENABLE_STATIC AND GEN_JAVASCRIPT_BINDINGS) |
| 73 | +diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt |
| 74 | +index 994b1234..5d18b8bf 100644 |
| 75 | +--- a/swig/python/CMakeLists.txt |
| 76 | ++++ b/swig/python/CMakeLists.txt |
| 77 | +@@ -1,30 +1,38 @@ |
| 78 | + set(PYTHON_SWIG_BINDING yang) |
| 79 | ++set(PYTHON_SWIG_TARGET yang${CUR_PYTHON_VERSION}) |
| 80 | + include_directories(${PYTHON_INCLUDE_PATH}) |
| 81 | + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) |
| 82 | ++include_directories(${PROJECT_SOURCE_DIR}/cpp/src) |
| 83 | + |
| 84 | + set(CMAKE_SWIG_FLAGS "-c++") |
| 85 | +-set(CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}") |
| 86 | ++set(CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}" "-I${PROJECT_SOURCE_DIR}/cpp/src") |
| 87 | + set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}) |
| 88 | + |
| 89 | +-set_source_files_properties(${PYTHON_SWIG_BINDING}.i PROPERTIES CPLUSPLUS ON PREFIX "") |
| 90 | ++set_source_files_properties(${PYTHON_SWIG_BINDING}.i PROPERTIES CPLUSPLUS ON PREFIX "" SWIG_MODULE_NAME ${PYTHON_SWIG_BINDING}) |
| 91 | + |
| 92 | + if(${CMAKE_VERSION} VERSION_LESS "3.8.0") |
| 93 | +- swig_add_module(${PYTHON_SWIG_BINDING} python ${PYTHON_SWIG_BINDING}.i) |
| 94 | ++ swig_add_module(${PYTHON_SWIG_TARGET} python ${PYTHON_SWIG_BINDING}.i) |
| 95 | + else() |
| 96 | +- swig_add_library(${PYTHON_SWIG_BINDING} LANGUAGE python SOURCES ${PYTHON_SWIG_BINDING}.i) |
| 97 | ++ swig_add_library(${PYTHON_SWIG_TARGET} LANGUAGE python SOURCES ${PYTHON_SWIG_BINDING}.i) |
| 98 | + endif() |
| 99 | +-swig_link_libraries(${PYTHON_SWIG_BINDING} ${PYTHON_LIBRARIES} libyang-cpp) |
| 100 | ++swig_link_libraries(${PYTHON_SWIG_TARGET} ${PYTHON_LIBRARIES} libyang-cpp) |
| 101 | ++ |
| 102 | ++set_target_properties(_${PYTHON_SWIG_TARGET} PROPERTIES OUTPUT_NAME "_yang${PYTHON_EXT_SUFFIX}" SUFFIX "") |
| 103 | + |
| 104 | + # Generate header with SWIG run-time functions |
| 105 | + execute_process(COMMAND ${SWIG_EXECUTABLE} -python -external-runtime ${CMAKE_CURRENT_BINARY_DIR}/swigpyrun.h) |
| 106 | + |
| 107 | +-file(COPY "examples" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) |
| 108 | ++add_custom_command(TARGET ${PYTHON_SWIG_TARGET}_swig_compilation POST_BUILD |
| 109 | ++ COMMAND sed -e "'s/\\(inst =.*tp_new.*\\)Py_None, Py_None);/PyObject *tup = PyTuple_New(0); \\1tup, Py_None); Py_DECREF(tup);/'" < swigpyrun.h > swigpyrun.h.new |
| 110 | ++ COMMAND sed -e "'s/\\(inst =.*tp_new.*\\)Py_None, Py_None);/PyObject *tup = PyTuple_New(0); \\1tup, Py_None); Py_DECREF(tup);/'" < yangPYTHON_wrap.cxx > yangPYTHON_wrap.cxx.new |
| 111 | ++ COMMAND diff -q swigpyrun.h swigpyrun.h.new || mv swigpyrun.h.new swigpyrun.h |
| 112 | ++ COMMAND diff -q yangPYTHON_wrap.cxx yangPYTHON_wrap.cxx.new || mv yangPYTHON_wrap.cxx.new yangPYTHON_wrap.cxx |
| 113 | ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
| 114 | ++ ) |
| 115 | + |
| 116 | +-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))" |
| 117 | +- OUTPUT_VARIABLE PYTHON_MODULE_PATH |
| 118 | +- OUTPUT_STRIP_TRAILING_WHITESPACE ) |
| 119 | ++file(COPY "examples" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) |
| 120 | + |
| 121 | +-install( TARGETS _${PYTHON_SWIG_BINDING} DESTINATION ${PYTHON_MODULE_PATH}) |
| 122 | ++install( TARGETS _${PYTHON_SWIG_TARGET} DESTINATION ${PYTHON_MODULE_PATH}) |
| 123 | + install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_SWIG_BINDING}.py" DESTINATION ${PYTHON_MODULE_PATH}) |
| 124 | + install( FILES "${CMAKE_CURRENT_BINARY_DIR}/swigpyrun.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyang) |
| 125 | + |
| 126 | +@@ -51,8 +59,8 @@ if(ENABLE_BUILD_TESTS) |
| 127 | + ADD_PYTHON_TEST(test_tree_data) |
| 128 | + ADD_PYTHON_TEST(test_tree_schema) |
| 129 | + |
| 130 | +- add_custom_command(TARGET ${SWIG_MODULE_${PYTHON_SWIG_BINDING}_REAL_NAME} POST_BUILD |
| 131 | +- COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/_${PYTHON_SWIG_BINDING}.so" ${PY2_SWIG_DIR}/tests |
| 132 | ++ add_custom_command(TARGET ${SWIG_MODULE_${PYTHON_SWIG_TARGET}_REAL_NAME} POST_BUILD |
| 133 | ++ COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/_yang${PYTHON_EXT_SUFFIX}" ${PY2_SWIG_DIR}/tests/_yang.so |
| 134 | + COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_SWIG_BINDING}.py" ${PY2_SWIG_DIR}/tests |
| 135 | + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
| 136 | + ) |
0 commit comments