diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-04-02 12:37:26 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-02 12:37:26 +0000 |
commit | b3f7df246e1bc4bd70e3956c6886e5bcfb3ab7a6 (patch) | |
tree | ff0d78bd13621b3fb4f1c1a906b1cefe9df8e78e /kde-base/kig | |
parent | Bump ansi-terminal to 0.6 (diff) | |
download | historical-b3f7df246e1bc4bd70e3956c6886e5bcfb3ab7a6.tar.gz historical-b3f7df246e1bc4bd70e3956c6886e5bcfb3ab7a6.tar.bz2 historical-b3f7df246e1bc4bd70e3956c6886e5bcfb3ab7a6.zip |
Remove unused patch.
Package-Manager: portage-2.1.11.59/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'kde-base/kig')
-rw-r--r-- | kde-base/kig/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kig/Manifest | 25 | ||||
-rw-r--r-- | kde-base/kig/files/kig-4.9.0-boostpython.patch | 448 |
3 files changed, 14 insertions, 465 deletions
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog index 540e75f8a1c8..c44aad10a4bf 100644 --- a/kde-base/kig/ChangeLog +++ b/kde-base/kig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kig # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.252 2013/04/01 16:03:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.253 2013/04/02 12:29:04 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/kig-4.9.0-boostpython.patch: + Remove unused patch. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -kig-4.10.0.ebuild, -kig-4.9.5.ebuild: diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest index 2d7172805866..0a3ed1657a26 100644 --- a/kde-base/kig/Manifest +++ b/kde-base/kig/Manifest @@ -1,26 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX kig-4.10.0-boostpython.patch 15010 SHA256 281b99a2c774c84e94505c325eea0736bc7aedc6aba923cdb91860f456401815 SHA512 9b9b818da1de68068fdd523f0ce2893e5ae34b11365a580f959a0e24f3e26ff402229b02c64988f9172d604d03cc2ae9310996e21c0917b2aa7fd8406b7b8c2c WHIRLPOOL a861957ea5aca9f1cfa011323c90a6b6b69c78890d7281e5c0747cd8d0dd97c36222c6b04ae9b6d39237e8c2155bc680e87b333ba9aa54b20cd007bcfe1f8cad -AUX kig-4.9.0-boostpython.patch 15733 SHA256 02ebd454100c70e7d4a8baae1d9b9fb79eb830718b1334e5ae2d0cbf1f6570a6 SHA512 8f2edfb3d4498e73dfff65ee532e6ba220fdff5c746dec8137c777b440cf8a911cb12aa6a3578d2b373f39179797685b4656f15a0e08396c8f4edd2a31f2b83c WHIRLPOOL 08b64893383692c71af2c15dd28391c02ecc7f8dd903609da339bc6e5010584baf529c29e4078c8967dcae4d262ea60b05b6c1e6d7fe60efecd182e76e9087f2 DIST kig-4.10.1.tar.xz 1527316 SHA256 5c817fd2a835e4eed1c52e3583cae96548660a1b48a2b2b49ed7648321e2fa76 SHA512 0bd8b98fb234bd6c68c6d4906065295409bbaef955e985bb0561e0261f67a6e67976603631a647984f1f8771ba73198a31ecfe68e7a8b7bb4de899ab2f7f52ea WHIRLPOOL 7542ef3fa705038927a0f8bf3a4c1ad0e828fba22bc94618646c0facdc79f5518d06fea8761854164a6a7e90fceb83b0c3a78726439dcb6e5991ac594150e616 EBUILD kig-4.10.1.ebuild 628 SHA256 a04812bf5386e3496ff9b182217b0f4ed7835d717425b56528b6e74ec2cbc1d1 SHA512 facc8e819bd65efa4697e9842295e86eb7592b68817ae3446f317dc405a85f5900701d7b9675c839eb421b1751aa47dcf66edf0ecbccff898514ec17fd3d0a6e WHIRLPOOL 1b3e151de003af8fa2830afcc637fd42663c29d7923981d7fecb66b659f162613dcfd513f13121b278853534a589acded08fd4afd39aef93c7d28fb43b3398ab -MISC ChangeLog 28785 SHA256 792c49e6c119ed5f83b6c48636dd64936244ed64f56b4493b3c7261a3b479957 SHA512 7465aba2c79a68ae21d029a1c587629f130f7e8bdab6f45a2bd6c7069966fc7be3ad85552caa0108f3924ab7b5710f092ad79044e2cc0e723e4e0d95e270f3f2 WHIRLPOOL e5049ac9003a187d68397c205481863b9e71b2cbdea6bed3296ccad37f8fb23c3f1c11d004daf1bc3c351a8e979730a307e0d41fa5c81931e7c8857e4213cbf9 +MISC ChangeLog 28910 SHA256 646c02c46eaf7a05f01069da132ac3e6535e975a87bd0ad1c21f140e65233a0d SHA512 bd32b74b77b40e4015ceb481430b480128cac75726c8603fe6c72ab726784bd591521bf3b15419151ecce1facabccb6ccb631ce090c8f9623a200e022913f390 WHIRLPOOL 558c115cdd9d6af654b1d16ecf48b57b258fc63206f265be0bb87f74a0ac64d72b17964e01ad39a752afbc1462d3e301c9ef432b47fee85cf6c6a0e99193c391 MISC metadata.xml 225 SHA256 d8e71ad960756b687369d4278755ce54044aed78ab70d603568ffb080a60f3ca SHA512 48bde5093d05011e08bc726705574668440d2ac110071a0700e0f7ba4d25da76e23537fe9b5edc3299f80ccbafea27457a04a12032859856ec3f73a91e3918b6 WHIRLPOOL 4e052f92cb34a46f89fbaae077fca03ea2cc4de9eb26f11ea4d00189850f1fe50b4ae9e64b739d73b0eb3d1bb12e34efb63aa88d2672bdee4a76624d79853fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRWa+BAAoJELp701BxlEWfxRkP/jm2e8s7eFrSfHiLfak6r9II -hvn07XhdQWq9FPvhpNKhvyWQKkFpQ0Oh8v23hNJG80+ISLKXYPKtjvko4Ae5nPol -Hc7Kk12dPAT3jwcidKuyaIe0NcNt4VZU83KiiaxWCP37gPNJERgn3f/PofPSoarO -SswTRkiC/6IQtTVe0rywFJgrKaPmnSMxNJxxx9YWSPjL1K0/kkepxX967AY8eFiw -yog2XpSevU8tK/nnLAXaeujWFLiBLfGQAnL0Ie1DyW0sanNBvScmFRT0koVT55zi -ztIDF/g2dn0v/nz9bbGy624LIcAOkq4yzKRFb6kQCZcDhoH2mvNasy3KrKv/K8r+ -a/fOq/J0dIQhVobv2/kPVgVpjKIvqakVA9o3e0Lq4HzdL27zVMHD6TN2oXw6iOd4 -i5+lKy8OBo1trnfoWId3NCR1boekjZGRoCF/wmCklGluP754hwjZLrFvDVKZQDMB -BKu+Yfy/p7tobGI84itQ31KuIRYeW5G3CoI/2+B8oodDhljfqU8FdrUyk8pl+9at -SozHZAdnPuy2MmDhPBRus9x2Xzisg1WL3hlovEVv8AidoZgMtUzozr8QqqfXUJ8X -lE1b1psU/TYMKBp/S7JC2bgAXddBpH/80eerRPaDn9H3oTww/gjeukn7HVTsCsmN -3X6hZE4n8anTrv6qjTCm -=LMEV +iQEcBAEBCAAGBQJRWs7uAAoJEMbwO6tnXQ0saYcH/iO00SXYZEWjUFw1SBsrS7EM +2+2uibPKZByVkPpyN9WzSFF43/dwFEgntRL8CpXuiI1rGlHhJp5RHPE9O987oJlk +1l+CZuFrVfTp26BoOAoQft7M9SwQUxHG6+cYbFf151kijFhT5wb4i039tp69qdTY +eXYIvzCoUJ4nd/v3Pl2VdN8iB8f/7cPQzDcuSwz2A3Z/DoVyaP14aduRCfSzl5xz +0nO0T+36amKxLE37UzqjQ323bDKJsO10BOty/ansxP1PnvG+B1NPwzxhg127LgdK +ZIFesKFZI4+VdPmoBBUN1KghLh39VIO/8/ohs0R+5jl6h8aCUbt5nVPOb6INck8= +=HRzf -----END PGP SIGNATURE----- diff --git a/kde-base/kig/files/kig-4.9.0-boostpython.patch b/kde-base/kig/files/kig-4.9.0-boostpython.patch deleted file mode 100644 index c2035b1e9485..000000000000 --- a/kde-base/kig/files/kig-4.9.0-boostpython.patch +++ /dev/null @@ -1,448 +0,0 @@ -From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Thu, 30 Aug 2012 14:02:44 +0200 -Subject: [PATCH] Use standard cmake module to find boost python. - ---- - CMakeLists.txt | 34 ++++---- - KigConfigureChecks.cmake | 4 +- - cmake/COPYING-CMAKE-SCRIPTS | 22 ------ - cmake/FindBoostPython.cmake | 153 ------------------------------------ - cmake/modules/FindBoostPython.cmake | 134 ------------------------------- - 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-) - delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS - delete mode 100644 cmake/FindBoostPython.cmake - delete mode 100644 cmake/modules/FindBoostPython.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ba3e377..092fde3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,6 @@ - project(kig) - --# --# taken from kdeedu/CMakeList.txt --# from here... --set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake ) -+option(WITH_SCRIPTING "Enable python scripting support" ON) - - # search packages used by KDE - find_package(KDE4 4.3.80 REQUIRED) -@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D - - # ...to here - --find_package(BoostPython) -+if(WITH_SCRIPTING) -+ find_package(PythonLibs) -+ find_package(Boost COMPONENTS python) -+endif(WITH_SCRIPTING) -+ -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ set(KIG_ENABLE_PYTHON_SCRIPTING 1) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - kde4_no_enable_final(kig) - -@@ -45,14 +49,14 @@ add_subdirectory( macros ) - #add_subdirectory( kfile ) - add_subdirectory( data ) - add_subdirectory( pykig ) --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - add_subdirectory( scripting ) --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BOOST_PYTHON_FOUND) -- include_directories(${BOOST_PYTHON_INCLUDES}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - # kigpart - -@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - scripting/newscriptwizard.cc - scripting/python_scripter.cc -@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND) - ) - - set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - - kde4_add_plugin(kigpart ${kigpart_PART_SRCS}) - - target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ) --if(BOOST_PYTHON_FOUND) -- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake -index fed38b3..a53ea73 100644 ---- a/KigConfigureChecks.cmake -+++ b/KigConfigureChecks.cmake -@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - --macro_optional_find_package(BoostPython) -- - # at the end, output the configuration - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake -@@ -18,7 +16,7 @@ configure_file( - ) - - macro_log_feature( -- BOOST_PYTHON_FOUND -+ Boost_PYTHON_FOUND - "Boost.Python" - "Kig can optionally use Boost.Python for Python scripting" - "http://www.boost.org/" -diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS -deleted file mode 100644 -index 4b41776..0000000 ---- a/cmake/COPYING-CMAKE-SCRIPTS -+++ /dev/null -@@ -1,22 +0,0 @@ --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions --are met: -- --1. Redistributions of source code must retain the copyright -- notice, this list of conditions and the following disclaimer. --2. Redistributions in binary form must reproduce the copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. --3. The name of the author may not be used to endorse or promote products -- derived from this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR --IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES --OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. --IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, --INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT --NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF --THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake -deleted file mode 100644 -index 6d5f05e..0000000 ---- a/cmake/FindBoostPython.cmake -+++ /dev/null -@@ -1,153 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --find_package(PkgConfig) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- # try pkg-config next -- set(_found FALSE) -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- pkg_check_modules(_python QUIET ${_pyver}) -- if (_python_FOUND) -- find_package(Boost 1.33 COMPONENTS python) -- if (Boost_PYTHON_FOUND) -- set(_found TRUE) -- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") -- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") -- endif(Boost_PYTHON_FOUND) -- endif(_python_FOUND) -- endif(NOT _found) -- endforeach(_pyver ${PYTHON_VERSIONS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) -diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake -deleted file mode 100644 -index 72aae54..0000000 ---- a/cmake/modules/FindBoostPython.cmake -+++ /dev/null -@@ -1,134 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- set(_found FALSE) -- -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) --- -1.7.12 - |