mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
dev-util/cmake: Removed last remaining 2.x version.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
|
||||
DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
|
||||
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
|
||||
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
|
||||
|
||||
@@ -1,195 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
CMAKE_REMOVE_MODULES="no"
|
||||
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="http://www.cmake.org/"
|
||||
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="CMake"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE="emacs ncurses 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:0= )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
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.7-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-desktop.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-libform.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.2-FindCurses.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
|
||||
|
||||
# execinfo.h on Solaris isn't quite what it is on Darwin
|
||||
if [[ ${CHOST} == *-solaris* ]] ; then
|
||||
sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
|
||||
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 and SelectLibraryConfigurations tests
|
||||
# these are altered thanks to our eclass
|
||||
sed -i -e 's:#IGNORE ::g' \
|
||||
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|
||||
|| die
|
||||
|
||||
pushd "${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
|
||||
"${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 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
|
||||
|
||||
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}/${PN}.vim"
|
||||
|
||||
dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
|
||||
rm -rf "${D}/usr/share/cmake/completions" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
http://public.kitware.com/Bug/view.php?id=7933
|
||||
|
||||
diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
|
||||
--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008
|
||||
+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008
|
||||
@@ -38,6 +38,13 @@
|
||||
int main() { return 0; }
|
||||
#endif
|
||||
|
||||
+#ifdef TEST_KWSYS_LFS_SUPPORT
|
||||
+#define _LARGE_FILES
|
||||
+#include <iostream>
|
||||
+int main() { return 0; }
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#ifdef TEST_KWSYS_IOS_HAVE_STD
|
||||
#include <iosfwd>
|
||||
void f(std ::ostream*) {}
|
||||
diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap
|
||||
--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008
|
||||
+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008
|
||||
@@ -1005,6 +1005,16 @@
|
||||
echo "${cmake_cxx_compiler} does not have stl iterator_traits"
|
||||
fi
|
||||
|
||||
+if cmake_try_run "${cmake_cxx_compiler}" \
|
||||
+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \
|
||||
+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
|
||||
+ KWSYS_LFS_AVAILABLE=1
|
||||
+ echo "LFS support available"
|
||||
+else
|
||||
+ KWSYS_LFS_AVAILABLE=0
|
||||
+ echo "LFS support unavailable, disabled"
|
||||
+fi
|
||||
+
|
||||
if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then
|
||||
if cmake_try_run "${cmake_cxx_compiler}" \
|
||||
"${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
|
||||
@@ -1,19 +0,0 @@
|
||||
Patch by Heiko Przybyl
|
||||
|
||||
--- Source/cmComputeLinkInformation.cxx
|
||||
+++ Source/cmComputeLinkInformation.cxx
|
||||
@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
|
||||
for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
|
||||
ri != runtimeDirs.end(); ++ri)
|
||||
{
|
||||
+ // Do not add duplicates.
|
||||
+ // I'd like to have that check already in the list generation code
|
||||
+ // but that would need lots of more changes, even in ExpandListArgument().
|
||||
+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
|
||||
+ {
|
||||
+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
|
||||
+ continue;
|
||||
+ }
|
||||
// Separate from previous path.
|
||||
rpath += sep;
|
||||
sep = this->GetRuntimeSep().c_str();
|
||||
@@ -1,50 +0,0 @@
|
||||
Do not detect Xcode and set -isysroot for its SDK, since that messes up
|
||||
our toolchain, and hence makes any compilation fail, bug #445308
|
||||
|
||||
--- Modules/Platform/Darwin.cmake
|
||||
+++ Modules/Platform/Darwin.cmake
|
||||
@@ -60,18 +60,18 @@
|
||||
endif()
|
||||
|
||||
# Ask xcode-select where to find /Developer or fall back to ancient location.
|
||||
-execute_process(COMMAND xcode-select -print-path
|
||||
- OUTPUT_VARIABLE _stdout
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_VARIABLE _stderr
|
||||
- RESULT_VARIABLE _failed)
|
||||
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
|
||||
- set(OSX_DEVELOPER_ROOT ${_stdout})
|
||||
-elseif(IS_DIRECTORY "/Developer")
|
||||
- set(OSX_DEVELOPER_ROOT "/Developer")
|
||||
-else()
|
||||
+#execute_process(COMMAND xcode-select -print-path
|
||||
+# OUTPUT_VARIABLE _stdout
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+# ERROR_VARIABLE _stderr
|
||||
+# RESULT_VARIABLE _failed)
|
||||
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
|
||||
+# set(OSX_DEVELOPER_ROOT ${_stdout})
|
||||
+#elseif(IS_DIRECTORY "/Developer")
|
||||
+# set(OSX_DEVELOPER_ROOT "/Developer")
|
||||
+#else()
|
||||
set(OSX_DEVELOPER_ROOT "")
|
||||
-endif()
|
||||
+#endif()
|
||||
|
||||
execute_process(COMMAND sw_vers -productVersion
|
||||
OUTPUT_VARIABLE CURRENT_OSX_VERSION
|
||||
@@ -91,10 +91,10 @@
|
||||
# CMAKE_OSX_DEPLOYMENT_TARGET
|
||||
|
||||
# Set cache variable - end user may change this during ccmake or cmake-gui configure.
|
||||
-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
|
||||
- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
|
||||
- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
|
||||
-endif()
|
||||
+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
|
||||
+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
|
||||
+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
|
||||
+#endif()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# CMAKE_OSX_SYSROOT
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
|
||||
index 645eb76..7be495f 100644
|
||||
--- a/Source/QtDialog/CMake.desktop
|
||||
+++ b/Source/QtDialog/CMake.desktop
|
||||
@@ -3,7 +3,7 @@ Version=1.0
|
||||
Name=CMake
|
||||
Comment=Cross-platform buildsystem
|
||||
Exec=cmake-gui %f
|
||||
-Icon=CMakeSetup32.png
|
||||
+Icon=CMakeSetup32
|
||||
Terminal=false
|
||||
X-MultipleArgs=false
|
||||
Type=Application
|
||||
@@ -1,22 +0,0 @@
|
||||
--- Modules/FindPythonInterp.cmake
|
||||
+++ Modules/FindPythonInterp.cmake
|
||||
@@ -60,6 +60,10 @@
|
||||
|
||||
list(APPEND _Python_NAMES python)
|
||||
|
||||
+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
|
||||
+ set(_Python_NAMES python)
|
||||
+endif()
|
||||
+
|
||||
# Search for the current active python version first
|
||||
find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
|
||||
|
||||
@@ -76,7 +80,7 @@
|
||||
unset(_PYTHON3_VERSIONS)
|
||||
|
||||
# Search for newest python version if python executable isn't found
|
||||
-if(NOT PYTHON_EXECUTABLE)
|
||||
+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
|
||||
foreach(_CURRENT_VERSION ${_Python_VERSIONS})
|
||||
set(_Python_NAMES python${_CURRENT_VERSION})
|
||||
if(WIN32)
|
||||
@@ -1,48 +0,0 @@
|
||||
--- b/Modules/FindBLAS.cmake
|
||||
+++ a/Modules/FindBLAS.cmake
|
||||
@@ -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/).
|
||||
@@ -40,6 +46,26 @@
|
||||
# (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(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
|
||||
|
||||
@@ -604,3 +630,8 @@
|
||||
endif()
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
+
|
||||
+
|
||||
+endif(PC_BLAS_FOUND)
|
||||
+
|
||||
+
|
||||
@@ -1,130 +0,0 @@
|
||||
From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
|
||||
From: Michael Palimaka <kensington@gentoo.org>
|
||||
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)
|
||||
Updated by Chris Reffett (cmake-2.8.11)
|
||||
|
||||
--- a/Modules/Platform/Darwin.cmake
|
||||
+++ b/Modules/Platform/Darwin.cmake
|
||||
@@ -252,9 +252,9 @@
|
||||
"<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
|
||||
|
||||
|
||||
-# 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()
|
||||
|
||||
# Older OS X linkers do not report their framework search path
|
||||
@@ -276,6 +276,8 @@
|
||||
|
||||
# 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
|
||||
@@ -298,13 +300,15 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-# 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+
|
||||
--- a/Modules/Platform/UnixPaths.cmake
|
||||
+++ b/Modules/Platform/UnixPaths.cmake
|
||||
@@ -33,6 +33,7 @@
|
||||
# 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 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,43 +0,0 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Dec 8 13:38:06 UTC 2013
|
||||
Subject: fix check for freetype-2.5.1
|
||||
|
||||
--- Modules/FindFreetype.cmake
|
||||
+++ Modules/FindFreetype.cmake
|
||||
@@ -64,6 +64,19 @@
|
||||
PATH_SUFFIXES include/freetype2 include
|
||||
)
|
||||
|
||||
+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
|
||||
+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
|
||||
+ HINTS
|
||||
+ ENV FREETYPE_DIR
|
||||
+ PATHS
|
||||
+ /usr/X11R6
|
||||
+ /usr/local/X11R6
|
||||
+ /usr/local/X11
|
||||
+ /usr/freeware
|
||||
+ PATH_SUFFIXES include/freetype2 include
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
find_library(FREETYPE_LIBRARY
|
||||
NAMES freetype libfreetype freetype219
|
||||
HINTS
|
||||
@@ -82,8 +95,14 @@
|
||||
endif()
|
||||
set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
|
||||
|
||||
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
|
||||
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||||
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
||||
+endif()
|
||||
+
|
||||
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
|
||||
+ file(STRINGS "${FREETYPE_H}" freetype_version_str
|
||||
REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
|
||||
|
||||
unset(FREETYPE_VERSION_STRING)
|
||||
@@ -1,77 +0,0 @@
|
||||
--- Modules/FindBoost.cmake
|
||||
+++ Modules/FindBoost.cmake
|
||||
@@ -905,6 +905,15 @@
|
||||
|
||||
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")
|
||||
+ # Get version of Python.
|
||||
+ if (NOT PYTHON_EXECUTABLE)
|
||||
+ #if a certain version of python was detected by cmake before use that one
|
||||
+ set(PYTHON_EXECUTABLE "python")
|
||||
+ endif (NOT PYTHON_EXECUTABLE)
|
||||
+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
|
||||
+ endif()
|
||||
+
|
||||
|
||||
#
|
||||
# Find RELEASE libraries
|
||||
@@ -915,6 +924,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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
|
||||
+ endif()
|
||||
if(_boost_STATIC_RUNTIME_WORKAROUND)
|
||||
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
|
||||
list(APPEND _boost_RELEASE_NAMES
|
||||
@@ -922,6 +939,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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_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})
|
||||
@@ -951,6 +975,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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
|
||||
+ endif()
|
||||
if(_boost_STATIC_RUNTIME_WORKAROUND)
|
||||
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
|
||||
list(APPEND _boost_DEBUG_NAMES
|
||||
@@ -958,6 +991,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_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_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})
|
||||
@@ -1,42 +0,0 @@
|
||||
--- cmake-2.8.12.1-orig/Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100
|
||||
+++ cmake-2.8.12.1/Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100
|
||||
@@ -30,7 +30,7 @@
|
||||
find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
|
||||
set(CURSES_USE_NCURSES FALSE)
|
||||
|
||||
-if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
|
||||
+if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
|
||||
set(CURSES_USE_NCURSES TRUE)
|
||||
endif()
|
||||
# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
|
||||
@@ -125,10 +125,20 @@
|
||||
CACHE FILEPATH "The curses library" ${FORCE_IT})
|
||||
endif()
|
||||
|
||||
+ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
|
||||
+ cbreak "" CURSES_NCURSES_HAS_CBREAK)
|
||||
+ if(NOT CURSES_NCURSES_HAS_CBREAK)
|
||||
+ find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
|
||||
+ find_library(CURSES_EXTRA_LIBRARY tinfo )
|
||||
+ CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
|
||||
+ cbreak "" CURSES_TINFO_HAS_CBREAK)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
|
||||
-find_library(CURSES_EXTRA_LIBRARY cur_colr )
|
||||
+if (NOT CURSES_TINFO_HAS_CBREAK)
|
||||
+ find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
|
||||
+ find_library(CURSES_EXTRA_LIBRARY cur_colr )
|
||||
+endif()
|
||||
|
||||
find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
|
||||
find_library(CURSES_FORM_LIBRARY form )
|
||||
@@ -172,5 +182,7 @@
|
||||
CURSES_INCLUDE_DIR
|
||||
CURSES_CURSES_HAS_WSYNCUP
|
||||
CURSES_NCURSES_HAS_WSYNCUP
|
||||
+ CURSES_NCURSES_HAS_CBREAK
|
||||
+ CURSES_TINFO_HAS_CBREAK
|
||||
)
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
|
||||
index 20f5dec..24ac58d 100644
|
||||
--- a/CompileFlags.cmake
|
||||
+++ b/CompileFlags.cmake
|
||||
@@ -66,5 +66,5 @@ endif ()
|
||||
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode
|
||||
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
|
||||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
|
||||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
|
||||
endif ()
|
||||
diff --git a/bootstrap b/bootstrap
|
||||
index 9784d5d..51d067e 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then
|
||||
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode
|
||||
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
|
||||
if ${cmake_machine_parisc}; then
|
||||
- # if -O[s23] is given the effect is inverted, so do not use the flag then
|
||||
- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
|
||||
- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
|
||||
- fi
|
||||
+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
|
||||
--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100
|
||||
+++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100
|
||||
@@ -1,3 +1,9 @@
|
||||
+#
|
||||
+# Version modified for Gentoo Linux
|
||||
+# If a valid PkgConfig configuration is found, this overrides and cancels
|
||||
+# all further checks.
|
||||
+#
|
||||
+
|
||||
# - Find LAPACK library
|
||||
# This module finds an installed fortran library that implements the LAPACK
|
||||
# linear-algebra interface (see http://www.netlib.org/lapack/).
|
||||
@@ -36,6 +42,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_LAPACK lapack)
|
||||
+if(PC_LAPACK_FOUND)
|
||||
+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
|
||||
+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_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_LAPACK_LIBRARY_DIRS}")
|
||||
+ endif (NOT ${PC_LIB}_LIBRARY)
|
||||
+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
|
||||
+ endforeach(PC_LIB)
|
||||
+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
|
||||
+ mark_as_advanced(LAPACK_LIBRARIES)
|
||||
+else(PC_LAPACK_FOUND)
|
||||
+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
|
||||
+
|
||||
set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
|
||||
get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
|
||||
@@ -305,3 +329,5 @@
|
||||
endif(BLA_F95)
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
+
|
||||
+endif(PC_LAPACK_FOUND)
|
||||
@@ -1,18 +0,0 @@
|
||||
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
|
||||
index c47f583..5783d37 100644
|
||||
--- a/Modules/FindPkgConfig.cmake
|
||||
+++ b/Modules/FindPkgConfig.cmake
|
||||
@@ -87,7 +87,12 @@
|
||||
set(PKG_CONFIG_VERSION 1)
|
||||
set(PKG_CONFIG_FOUND 0)
|
||||
|
||||
-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
|
||||
+if(NOT PKG_CONFIG_EXECUTABLE)
|
||||
+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
|
||||
+ if(NOT PKG_CONFIG_EXECUTABLE)
|
||||
+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
|
||||
+ endif(NOT PKG_CONFIG_EXECUTABLE)
|
||||
+endif(NOT PKG_CONFIG_EXECUTABLE)
|
||||
mark_as_advanced(PKG_CONFIG_EXECUTABLE)
|
||||
|
||||
if(PKG_CONFIG_EXECUTABLE)
|
||||
Reference in New Issue
Block a user