From e706db2238e278893544c437cb014c9627d3e215 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Thu, 30 Aug 2007 15:34:51 +0000 Subject: [PATCH] - improved makefiles --- swig/python/CMakeLists.txt | 12 ++++++------ swig/ruby/CMakeLists.txt | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index 591940d..051e791 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -1,15 +1,15 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +FIND_PACKAGE(PythonInterp REQUIRED) FIND_PACKAGE(PythonLibs REQUIRED) -MESSAGE( STATUS "Python include path: ${PYTHON_INCLUDE_PATH}" ) -IF(DEFINED LIB) - SET(PYTHON_LIB_PATH "/usr/${LIB}/python2.5/site-packages/") -ELSE(DEFINED LIB) - SET(PYTHON_LIB_PATH "/usr/lib/python2.5/site-packages/") -ENDIF(DEFINED LIB) +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib()" OUTPUT_VARIABLE PYTHON_LIB_PATH) +STRING(REPLACE "\n" "" PYTHON_LIB_PATH "${PYTHON_LIB_PATH}") + +MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}") +MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt index 78108d7..3e144aa 100644 --- a/swig/ruby/CMakeLists.txt +++ b/swig/ruby/CMakeLists.txt @@ -2,10 +2,12 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") FIND_PACKAGE(Ruby REQUIRED) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" - OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) -MESSAGE( STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}" ) -MESSAGE( STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}" ) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) + +MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") +MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") +MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) -- 2.7.4