ref: refs/heads/master commit fc6b5c9d4a93db816338386b56570b5da22f840e Author: Michael Andres Date: Thu Dec 3 15:42:36 2009 +0100 Pass py_sitedir from .spec file to cmake. --- libzypp-bindings.spec.cmake | 1 + swig/python/CMakeLists.txt | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index a5fc442..39f4df1 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -31,6 +31,7 @@ This package provides bindings for libzypp, the library for package management. mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DPYTHON_SITEDIR=%{py_sitedir} \ -DLIB=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index 88b02ff..2542f5a 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -15,11 +15,13 @@ ADD_SUBDIRECTORY(tests) SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.cc" ) FIND_PACKAGE(PythonInterp REQUIRED) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_PATH) +IF (NOT PYTHON_SITEDIR) + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_SITEDIR) +ENDIF (NOT PYTHON_SITEDIR) -MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") -MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}") +MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") +MESSAGE(STATUS "Python site dir: ${PYTHON_SITEDIR}") ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} @@ -41,5 +43,5 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) TARGET_LINK_LIBRARIES( zypp_python ${ZYPP_LIBRARY} ) -INSTALL(TARGETS zypp_python LIBRARY DESTINATION ${PYTHON_LIB_PATH}) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_LIB_PATH}) +INSTALL(TARGETS zypp_python LIBRARY DESTINATION ${PYTHON_SITEDIR}) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.py DESTINATION ${PYTHON_SITEDIR}) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org