|
 |
39db6f6 |
diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt
|
|
|
39db6f6 |
--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200
|
|
|
39db6f6 |
+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt 2017-01-16 14:08:53.201529586 +0100
|
|
|
f647523 |
@@ -10,6 +10,7 @@ include_directories(${CMAKE_BINARY_DIR})
|
|
|
f647523 |
|
|
|
f647523 |
IF( BUILD_PYTHON )
|
|
|
f647523 |
add_subdirectory(python)
|
|
|
f647523 |
+add_subdirectory(python3)
|
|
|
f647523 |
ENDIF( BUILD_PYTHON )
|
|
|
f647523 |
|
|
|
f647523 |
IF( BUILD_RUBY )
|
|
|
39db6f6 |
diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt
|
|
|
39db6f6 |
--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig 2017-01-16 14:08:09.000000000 +0100
|
|
|
39db6f6 |
+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt 2017-01-16 14:10:48.945480021 +0100
|
|
|
f647523 |
@@ -12,11 +12,28 @@ enable_testing()
|
|
|
f647523 |
|
|
|
f647523 |
add_subdirectory(tests)
|
|
|
f647523 |
|
|
|
39db6f6 |
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
|
|
|
f647523 |
-STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
|
|
|
f647523 |
+MESSAGE(STATUS "Python3 build:")
|
|
|
f647523 |
+unset(Python_ADDITIONAL_VERSIONS)
|
|
|
f647523 |
+set(Python_ADDITIONAL_VERSIONS 3.5)
|
|
|
f647523 |
+FIND_PACKAGE(PythonLibs)
|
|
|
f647523 |
+IF (PYTHON_LIBRARY)
|
|
|
f647523 |
+ FIND_PACKAGE(PythonInterp REQUIRED)
|
|
|
f647523 |
+ #MESSAGE(STATUS "Found PythonLibs...")
|
|
|
f647523 |
+ FIND_PACKAGE(PythonLinkLibs)
|
|
|
f647523 |
+ #IF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
+ # MESSAGE(STATUS "Building Python...")
|
|
|
f647523 |
+ #ENDIF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
+ENDIF (PYTHON_LIBRARY)
|
|
|
f647523 |
+
|
|
|
f647523 |
+set(PYTHON3_EXECUTABLE "${PYTHON_EXECUTABLE}")
|
|
|
f647523 |
+set(PYTHON3_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}")
|
|
|
f647523 |
+set({PYTHON3_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}")
|
|
|
f647523 |
|
|
|
f647523 |
-MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
|
|
|
f647523 |
-MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}")
|
|
|
f647523 |
+EXECUTE_PROCESS(COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON3_LIB_DIR)
|
|
|
f647523 |
+STRING(REPLACE "\n" "" PYTHON3_LIB_DIR "${PYTHON3_LIB_DIR}")
|
|
|
f647523 |
+
|
|
|
f647523 |
+MESSAGE(STATUS "Python executable: ${PYTHON3_EXECUTABLE}")
|
|
|
f647523 |
+MESSAGE(STATUS "Python lib dir: ${PYTHON3_LIB_DIR}")
|
|
|
f647523 |
|
|
|
f647523 |
SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" )
|
|
|
f647523 |
|
|
|
f647523 |
@@ -36,14 +53,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_
|
|
|
f647523 |
ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} )
|
|
|
f647523 |
SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" )
|
|
|
f647523 |
|
|
|
f647523 |
-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} )
|
|
|
f647523 |
+INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_DIRS} )
|
|
|
f647523 |
# RHEL5 needs this:
|
|
|
f647523 |
-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
|
|
|
f647523 |
+INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_PATH} )
|
|
|
f647523 |
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
|
|
|
f647523 |
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include )
|
|
|
f647523 |
|
|
|
f647523 |
TARGET_LINK_LIBRARIES( pywsman wsman )
|
|
|
f647523 |
TARGET_LINK_LIBRARIES( pywsman wsman_client )
|
|
|
f647523 |
|
|
|
f647523 |
-INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR})
|
|
|
f647523 |
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} )
|
|
|
f647523 |
+INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON3_LIB_DIR})
|
|
|
f647523 |
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON3_LIB_DIR} )
|
|
|
39db6f6 |
diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt
|
|
|
39db6f6 |
--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200
|
|
|
39db6f6 |
+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt 2017-01-16 14:12:51.954427345 +0100
|
|
|
f647523 |
@@ -12,11 +12,52 @@ enable_testing()
|
|
|
f647523 |
|
|
|
f647523 |
add_subdirectory(tests)
|
|
|
f647523 |
|
|
|
39db6f6 |
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
|
|
|
f647523 |
-STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
|
|
|
f647523 |
+MESSAGE(STATUS "Python2 build:")
|
|
|
f647523 |
+set(Python_ADDITIONAL_VERSIONS 2.7)
|
|
|
f647523 |
+FIND_PACKAGE(PythonLibs)
|
|
|
f647523 |
+IF (PYTHON_LIBRARY)
|
|
|
f647523 |
+ FIND_PACKAGE(PythonInterp REQUIRED)
|
|
|
f647523 |
+ #MESSAGE(STATUS "Found PythonLibs...")
|
|
|
f647523 |
+ FIND_PACKAGE(PythonLinkLibs)
|
|
|
f647523 |
+ #IF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
+ # MESSAGE(STATUS "Building Python...")
|
|
|
f647523 |
+ #ENDIF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
+ENDIF (PYTHON_LIBRARY)
|
|
|
f647523 |
+
|
|
|
f647523 |
+set(PYTHON2_EXECUTABLE "${PYTHON_EXECUTABLE}")
|
|
|
f647523 |
+set(PYTHON2_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}")
|
|
|
f647523 |
+set(PYTHON2_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}")
|
|
|
f647523 |
+
|
|
|
f647523 |
+# clear FIND_PACKAGE(PythonLibs) side effects
|
|
|
f647523 |
+unset(PYTHONLIBS_FOUND)
|
|
|
f647523 |
+unset(PYTHON_LIBRARIES)
|
|
|
f647523 |
+unset(PYTHON_INCLUDE_PATH)
|
|
|
f647523 |
+unset(PYTHON_INCLUDE_DIRS)
|
|
|
f647523 |
+unset(PYTHON_DEBUG_LIBRARIES)
|
|
|
f647523 |
+unset(PYTHONLIBS_VERSION_STRING)
|
|
|
f647523 |
+unset(PYTHON_DEBUG_LIBRARY CACHE)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY_DEBUG)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY_RELEASE)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY CACHE)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY_DEBUG CACHE)
|
|
|
f647523 |
+unset(PYTHON_LIBRARY_RELEASE CACHE)
|
|
|
f647523 |
+unset(PYTHON_INCLUDE_DIR CACHE)
|
|
|
f647523 |
+unset(PYTHON_INCLUDE_DIR2 CACHE)
|
|
|
f647523 |
+
|
|
|
f647523 |
+# clear FIND_PACKAGE(PythonInterp) side effects
|
|
|
f647523 |
+unset(PYTHONINTERP_FOUND)
|
|
|
f647523 |
+unset(PYTHON_EXECUTABLE CACHE)
|
|
|
f647523 |
+unset(PYTHON_VERSION_STRING)
|
|
|
f647523 |
+unset(PYTHON_VERSION_MAJOR)
|
|
|
f647523 |
+unset(PYTHON_VERSION_MINOR)
|
|
|
f647523 |
+unset(PYTHON_VERSION_PATCH)
|
|
|
f647523 |
|
|
|
f647523 |
-MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
|
|
|
f647523 |
-MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}")
|
|
|
f647523 |
+EXECUTE_PROCESS(COMMAND ${PYTHON2_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON2_LIB_DIR)
|
|
|
f647523 |
+STRING(REPLACE "\n" "" PYTHON2_LIB_DIR "${PYTHON2_LIB_DIR}")
|
|
|
f647523 |
+
|
|
|
f647523 |
+MESSAGE(STATUS "Python executable: ${PYTHON2_EXECUTABLE}")
|
|
|
f647523 |
+MESSAGE(STATUS "Python lib dir: ${PYTHON2_LIB_DIR}")
|
|
|
f647523 |
|
|
|
f647523 |
SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" )
|
|
|
f647523 |
|
|
|
f647523 |
@@ -36,14 +77,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_
|
|
|
f647523 |
ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} )
|
|
|
f647523 |
SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" )
|
|
|
f647523 |
|
|
|
f647523 |
-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} )
|
|
|
f647523 |
+INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_DIRS} )
|
|
|
f647523 |
# RHEL5 needs this:
|
|
|
f647523 |
-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
|
|
|
f647523 |
+INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_PATH} )
|
|
|
f647523 |
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
|
|
|
f647523 |
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include )
|
|
|
f647523 |
|
|
|
f647523 |
TARGET_LINK_LIBRARIES( pywsman wsman )
|
|
|
f647523 |
TARGET_LINK_LIBRARIES( pywsman wsman_client )
|
|
|
f647523 |
|
|
|
f647523 |
-INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR})
|
|
|
f647523 |
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} )
|
|
|
f647523 |
+INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON2_LIB_DIR})
|
|
|
f647523 |
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON2_LIB_DIR} )
|
|
|
39db6f6 |
diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt
|
|
|
39db6f6 |
--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200
|
|
|
39db6f6 |
+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt 2017-01-16 14:13:37.300407926 +0100
|
|
|
39db6f6 |
@@ -175,30 +175,6 @@ MESSAGE(STATUS "Building Ruby bindings"
|
|
|
f647523 |
ENDIF(NOT RUBY_INCLUDE_PATH )
|
|
|
f647523 |
ENDIF( BUILD_RUBY )
|
|
|
f647523 |
|
|
|
f647523 |
-IF( BUILD_PYTHON )
|
|
|
f647523 |
- MESSAGE(STATUS "Building Python bindings" )
|
|
|
39db6f6 |
- FIND_PACKAGE(PythonLibs 2.6 REQUIRED)
|
|
|
f647523 |
- IF (PYTHON_LIBRARY)
|
|
|
39db6f6 |
- FIND_PACKAGE(PythonInterp 2.6 REQUIRED)
|
|
|
f647523 |
- MESSAGE(STATUS "Found PythonLibs...")
|
|
|
f647523 |
- FIND_PACKAGE(PythonLinkLibs)
|
|
|
f647523 |
- IF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
- MESSAGE(STATUS "Building Python...")
|
|
|
f647523 |
- ENDIF (PYTHON_LINK_LIBS)
|
|
|
f647523 |
- ENDIF (PYTHON_LIBRARY)
|
|
|
f647523 |
- IF(NOT PYTHON_INCLUDE_DIRS )
|
|
|
f647523 |
- # fallback for older versions of cmake
|
|
|
f647523 |
- SET(PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_PATH)
|
|
|
f647523 |
- ENDIF(NOT PYTHON_INCLUDE_DIRS )
|
|
|
f647523 |
- IF(NOT PYTHON_INCLUDE_DIRS )
|
|
|
f647523 |
- IF(BUILD_PYTHON_EXPLICIT)
|
|
|
f647523 |
- NO_HEADERS_WARNING_EXPL(BUILD_PYTHON Python)
|
|
|
f647523 |
- ELSE(BUILD_PYTHON_EXPLICIT)
|
|
|
f647523 |
- NO_HEADERS_WARNING(BUILD_PYTHON Python)
|
|
|
f647523 |
- ENDIF(BUILD_PYTHON_EXPLICIT)
|
|
|
f647523 |
- ENDIF(NOT PYTHON_INCLUDE_DIRS )
|
|
|
f647523 |
-ENDIF( BUILD_PYTHON )
|
|
|
f647523 |
-
|
|
|
f647523 |
IF( BUILD_PERL )
|
|
|
f647523 |
INCLUDE(FindPerl)
|
|
|
f647523 |
IF(PERL_EXECUTABLE)
|