cmake: Update to 3.0.0
This commit is contained in:
@@ -3,42 +3,38 @@
|
||||
_realname=cmake
|
||||
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.8.12.2
|
||||
pkgrel=4
|
||||
pkgver=3.0.0
|
||||
pkgrel=1
|
||||
pkgdesc="A cross-platform open-source make system (mingw-w64)."
|
||||
arch=('any')
|
||||
url="http://www.cmake.org/"
|
||||
license=("MIT")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-qt5")
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
|
||||
"${MINGW_PACKAGE_PREFIX}-curl"
|
||||
"${MINGW_PACKAGE_PREFIX}-expat"
|
||||
"${MINGW_PACKAGE_PREFIX}-libarchive"
|
||||
"${MINGW_PACKAGE_PREFIX}-zlib")
|
||||
"${MINGW_PACKAGE_PREFIX}-curl"
|
||||
"${MINGW_PACKAGE_PREFIX}-expat"
|
||||
"${MINGW_PACKAGE_PREFIX}-libarchive"
|
||||
"${MINGW_PACKAGE_PREFIX}-zlib")
|
||||
optdepends=("${MINGW_PACKAGE_PREFIX}-qt5: CMake Qt GUI")
|
||||
options=('staticlibs' 'strip')
|
||||
source=("http://www.cmake.org/files/v2.8/${_realname}-${pkgver}.tar.gz"
|
||||
"findfreetype.patch"
|
||||
source=("http://www.cmake.org/files/v3.0/${_realname}-${pkgver}.tar.gz"
|
||||
"disable-response-files-for-msys.patch"
|
||||
"dont-install-bundle.patch")
|
||||
md5sums=('17c6513483d23590cbce6957ec6d1e66'
|
||||
'90321de1d9d46cd8d6609d0509dbd7b0'
|
||||
md5sums=('21a1c85e1a3b803c4b48e7ff915a863e'
|
||||
'b715f7d6859ce82a0a1824592ab2a448'
|
||||
'fb33ace70ba863159b2c7964a9661e1e')
|
||||
|
||||
prepare() {
|
||||
cd ${_realname}-${pkgver}
|
||||
patch -Np1 -i ${srcdir}/findfreetype.patch
|
||||
patch -Np1 -i ${srcdir}/disable-response-files-for-msys.patch
|
||||
patch -Np1 -i ${srcdir}/dont-install-bundle.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}
|
||||
pushd ${MINGW_PREFIX} > /dev/null
|
||||
export PREFIX_LIB=`pwd -W`
|
||||
popd > /dev/null
|
||||
|
||||
|
||||
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
|
||||
cd "${srcdir}/build-${MINGW_CHOST}"
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
|
||||
index 179dc00..0f5a2b4 100644
|
||||
--- a/Modules/FindFreetype.cmake
|
||||
+++ b/Modules/FindFreetype.cmake
|
||||
@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
|
||||
ENV GTKMM_BASEPATH
|
||||
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
|
||||
- PATH_SUFFIXES include/freetype2 include
|
||||
+ PATH_SUFFIXES include/freetype2 include/freetype include
|
||||
)
|
||||
|
||||
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
|
||||
+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
|
||||
HINTS
|
||||
ENV FREETYPE_DIR
|
||||
PATHS
|
||||
@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
|
||||
ENV GTKMM_BASEPATH
|
||||
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
|
||||
- PATH_SUFFIXES include/freetype2 include
|
||||
+ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype
|
||||
)
|
||||
|
||||
find_library(FREETYPE_LIBRARY
|
||||
Reference in New Issue
Block a user