From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 761D71381F3 for ; Sun, 14 Apr 2013 17:57:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04348E0A5E; Sun, 14 Apr 2013 17:57:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81B51E0A5E for ; Sun, 14 Apr 2013 17:57:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C61833DD28 for ; Sun, 14 Apr 2013 17:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 07BC4E4073 for ; Sun, 14 Apr 2013 17:57:14 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1365962125.b8177ac2e3c374e46952d762aab8d8d98679455a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.10.2-r2.ebuild dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild dev-util/cmake/cmake-2.8.11_rc2.ebuild dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b8177ac2e3c374e46952d762aab8d8d98679455a X-VCS-Branch: master Date: Sun, 14 Apr 2013 17:57:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eaf3ecb5-6928-48fc-8598-593f794ba7db X-Archives-Hash: 52dff43b0d5b5f25eed97a8838efc049 commit: b8177ac2e3c374e46952d762aab8d8d98679455a Author: Michael Palimaka gentoo org> AuthorDate: Sun Apr 14 17:55:25 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 14 17:55:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b8177ac2 [dev-util/cmake] Fix detection of newer imagemagic wrt bug #465898. Remove old. Package-Manager: portage-2.1.11.62 --- dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 191 -------------------- ....8.11_rc2.ebuild => cmake-2.8.11_rc2-r1.ebuild} | 1 + .../files/cmake-2.8.10-more-no_host_paths.patch | 134 -------------- .../files/cmake-2.8.10.2-implicit-include.patch | 139 -------------- .../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++ dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 ----- .../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 -------- 7 files changed, 35 insertions(+), 582 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild deleted file mode 100644 index 84291ad..0000000 --- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses +qt4 qt5 vim-syntax" - -REQUIRED_USE="?? ( qt4 qt5 )" - -DEPEND=" - >=app-arch/libarchive-2.8.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - ncurses? ( sys-libs/ncurses ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch - "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch - "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch - "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.8.10-desktop.patch - "${FILESDIR}"/${PN}-2.8.10-libform.patch - "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir test - # this is altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die - - pushd "${CMAKE_BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # CTest.updatecvs, which fails to commit as root - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-2.8.11_rc2.ebuild b/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild similarity index 99% rename from dev-util/cmake/cmake-2.8.11_rc2.ebuild rename to dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild index e9e5d4c..4b075c6 100644 --- a/dev-util/cmake/cmake-2.8.11_rc2.ebuild +++ b/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch + "${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch ) diff --git a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch deleted file mode 100644 index 88927a3..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Tue, 6 Nov 2012 23:35:34 +1100 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Updated by Johannes Huber (cmake-2.8.9) -Updated by Michael Palimaka (cmake-2.8.10) ---- - Modules/Platform/Darwin.cmake | 12 +++++++---- - Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- - 2 files changed, 29 insertions(+), 26 deletions(-) - -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index a401762..775e547 100644 ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK - " -o ") - - --# default to searching for frameworks first -+# default to searching for frameworks last - if(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- set(CMAKE_FIND_FRAMEWORK FIRST) -+ set(CMAKE_FIND_FRAMEWORK LAST) - endif() - # set up the default search directories for frameworks - set(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks - /System/Library/Frameworks) - --# default to searching for application bundles first -+# default to searching for application bundles last - if(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- set(CMAKE_FIND_APPBUNDLE FIRST) -+ set(CMAKE_FIND_APPBUNDLE LAST) - endif() - # set up the default search directories for application bundles - set(_apps_paths) - foreach(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index ccb2663..0501d53 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - --- -1.8.0 - diff --git a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch deleted file mode 100644 index f0ea5e8..0000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- a/Source/cmLocalGenerator.cxx -+++ b/Source/cmLocalGenerator.cxx -@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags( - void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs, - cmGeneratorTarget* target, - const char* lang, -- const char *config) -+ const char *config, -+ bool stripImplicitInclDirs -+ ) - { - // Need to decide whether to automatically include the source and - // binary directories at the beginning of the include path. -@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs, - return; - } - -- // Load implicit include directories for this language. -- std::string impDirVar = "CMAKE_"; -- impDirVar += lang; -- impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; -- if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) -+ if (stripImplicitInclDirs) - { -- std::vector impDirVec; -- cmSystemTools::ExpandListArgument(value, impDirVec); -- for(std::vector::const_iterator i = impDirVec.begin(); -- i != impDirVec.end(); ++i) -+ // Load implicit include directories for this language. -+ std::string impDirVar = "CMAKE_"; -+ impDirVar += lang; -+ impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; -+ if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) - { -- emitted.insert(*i); -+ std::vector impDirVec; -+ cmSystemTools::ExpandListArgument(value, impDirVec); -+ for(std::vector::const_iterator i = impDirVec.begin(); -+ i != impDirVec.end(); ++i) -+ { -+ emitted.insert(*i); -+ } - } - } - ---- a/Source/cmLocalGenerator.h -+++ b/Source/cmLocalGenerator.h -@@ -212,7 +212,8 @@ public: - /** Get the include flags for the current makefile and language. */ - void GetIncludeDirectories(std::vector& dirs, - cmGeneratorTarget* target, -- const char* lang = "C", const char *config = 0); -+ const char* lang = "C", const char *config = 0, -+ bool stripImplicitInclDirs = true); - - /** Compute the language used to compile the given source file. */ - const char* GetSourceFileLanguage(const cmSourceFile& source); ---- a/Source/cmQtAutomoc.cxx -+++ b/Source/cmQtAutomoc.cxx -@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) - } - - -- const char* qtIncDir = 0; -- const char* qtCoreIncDir = 0; -- -- // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs, -- // see http://public.kitware.com/Bug/view.php?id=13667 -- bool qtIncludeDirMayHaveBeenRemoved = false; -- if (makefile->IsSet("QT_INCLUDE_DIR")) -- { -- qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR"); -- std::string s = -- makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES"); -- std::vector implIncDirs; -- cmSystemTools::ExpandListArgument(s, implIncDirs); -- if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir)) -- != implIncDirs.end()) -- { -- qtIncludeDirMayHaveBeenRemoved = true; -- if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR")) -- { -- qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR"); -- } -- } -- } -- -- bool haveQtCoreIncDir = false; -- bool haveQtIncDir = false; -- - std::vector includeDirs; - cmGeneratorTarget gtgt(target); -- localGen->GetIncludeDirectories(includeDirs, >gt, "CXX"); -+ // Get the include dirs for this target, without stripping the implicit -+ // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667 -+ localGen->GetIncludeDirectories(includeDirs, >gt, "CXX", 0, false); - std::string _moc_incs = ""; - const char* sep = ""; - for(std::vector::const_iterator incDirIt = includeDirs.begin(); -@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) - _moc_incs += sep; - sep = ";"; - _moc_incs += *incDirIt; -- -- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667 -- { -- if (*incDirIt == qtIncDir) -- { -- haveQtIncDir = true; -- qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed -- } -- if (*incDirIt == qtCoreIncDir) -- { -- haveQtCoreIncDir = true; -- } -- } -- } -- -- // Some projects (kdelibs, phonon) query the compiler for its default -- // include search dirs, and add those to -- // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES. -- // These may include e.g./usr/lib/qt/include . This is typically also part -- // of ${QT_INCLUDES}. If this directory is then contained in the implicit -- // include dirs, it is removed from the include dirs returned from the -- // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected -- // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't -- // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think. -- // See #13646 and #13667. -- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir -- && (haveQtCoreIncDir == true) && (haveQtIncDir == false)) -- { -- _moc_incs += sep; -- sep = ";"; -- _moc_incs += qtIncDir; - } - - const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); --- -1.7.0 diff --git a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch new file mode 100644 index 0000000..f5b70c1 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/show_bug.cgi?id=465898 + +--- Modules/FindImageMagick.cmake ++++ Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +@@ -147,17 +147,17 @@ + ) + if(component STREQUAL "Magick++") + FIND_IMAGEMAGICK_API(Magick++ Magick++.h +- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 ++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + elseif(component STREQUAL "MagickWand") + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h +- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 ++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + elseif(component STREQUAL "MagickCore") + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h +- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 ++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) + else() diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch deleted file mode 100644 index a91214c..0000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake ---- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -39,6 +45,24 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_BLAS blas) -+if(PC_BLAS_FOUND) -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) -+ mark_as_advanced(BLAS_LIBRARIES) -+else(PC_BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(CheckFunctionExists) - include(CheckFortranFunctionExists) - -@@ -622,3 +646,6 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_BLAS_FOUND) -+ diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch deleted file mode 100644 index edaa91f..0000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -953,6 +953,11 @@ - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") - -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass. -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi) -+ endif() -+ - # - # Find RELEASE libraries - # -@@ -962,6 +967,14 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -969,6 +982,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -994,6 +1014,15 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -1001,6 +1030,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})