[gentoo-commits] gentoo-x86 commit in kde-apps/kig/files: kig-4.12.0-boostpython.patch

[gentoo-commits] gentoo-x86 commit in kde-apps/kig/files: kig-4.12.0-boostpython.patch

[Michael Palimaka (kensington)]

kensington    15/06/04 18:44:43

  Added:                kig-4.12.0-boostpython.patch
  Log:
  Moved package from kde-base to kde-apps.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.1                  kde-apps/kig/files/kig-4.12.0-boostpython.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kig/files/kig-4.12.0-boostpython.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-apps/kig/files/kig-4.12.0-boostpython.patch?rev=1.1&content-type=text/plain

Index: kig-4.12.0-boostpython.patch
===================================================================
diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
index 2ccc161..02d9bf6 100644
--- a/cmake/modules/FindBoostPython.cmake
+++ b/cmake/modules/FindBoostPython.cmake
@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND)
     # Second try: try pkg-config way
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
-      set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
+      execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS)
       foreach(_pyver ${PYTHON_VERSIONS})
         if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS)
-          pkg_check_modules(${_pyver} QUIET ${_pyver})
+         pkg_check_modules(_python python-${_pyver})
           if(${_pyver}_FOUND)
             cmake_push_check_state()
             set(CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${${_pyver}_INCLUDE_DIRS})