File sle10.patch of Package konkretcmpi

Overview Repositories Revisions Requests Users Attributes Meta

File sle10.patch of Package konkretcmpi (Revision 3038722a5832eeec0f0f9f67f86f908b)

Currently displaying revision 3038722a5832eeec0f0f9f67f86f908b , Show latest

diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-konkretcmpi-0.9.2/src/mof/python/CMakeLists.txt ./src/mof/python/CMakeLists.txt
--- ../orig-konkretcmpi-0.9.2/src/mof/python/CMakeLists.txt	2013-09-25 14:36:56.000000000 +0200
+++ ./src/mof/python/CMakeLists.txt	2014-01-17 12:12:09.016410545 +0100
@@ -4,17 +4,20 @@
 
 set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4)
 find_package(PythonLibs REQUIRED)
-string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" PYTHON_VER "${PYTHONLIBS_VERSION_STRING}")
 
-include_directories(${PYTHON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+EXECUTE_PROCESS(COMMAND "python" -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
+EXECUTE_PROCESS(COMMAND "python" -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_ARCH_DIR)
+
+include_directories(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 set(CMAKE_SWIG_FLAGS "-c++")
 
 set_source_files_properties(konkretmof.i PROPERTIES CPLUSPLUS ON)
 set_source_files_properties(konkretmof.i PROPERTIES SWIG_FLAGS "-includeall")
+set_property(SOURCE konkretmof.i APPEND PROPERTY SWIG_FLAGS "-classic")
 swig_add_module(konkretmof python
   konkretmof.i)
-swig_link_libraries(konkretmof ${PYTHON_LIBRARIES} konkretmof)
+swig_link_libraries(konkretmof ${PYTHON_LIBRARIES} pthread util dl konkretmof)
 
-install(TARGETS ${SWIG_MODULE_konkretmof_REAL_NAME} DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VER}/site-packages)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VER}/site-packages)
+install(TARGETS ${SWIG_MODULE_konkretmof_REAL_NAME} DESTINATION ${PYTHON_ARCH_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/konkretmof.py DESTINATION ${PYTHON_LIB_DIR})

Places

File sle10.patch of Package konkretcmpi (Revision 3038722a5832eeec0f0f9f67f86f908b)

Places