[134053] trunk/dports/devel/cmake/Portfile
michaelld at macports.org
michaelld at macports.org
Tue Mar 17 12:47:23 PDT 2015
Revision: 134053
https://trac.macports.org/changeset/134053
Author: michaelld at macports.org
Date: 2015-03-17 12:47:23 -0700 (Tue, 17 Mar 2015)
Log Message:
-----------
cmake:
+ update to 3.2.1;
+ CMake 3.2 changed dependency requirements to include jsoncpp. jsoncpp 1.0 requires CMake for building. catch 22. So, have CMake use its internal jsoncpp until a better solution comes about.
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2015-03-17 19:43:36 UTC (rev 134052)
+++ trunk/dports/devel/cmake/Portfile 2015-03-17 19:47:23 UTC (rev 134053)
@@ -5,7 +5,7 @@
PortGroup muniversal 1.0
name cmake
-version 3.1.3
+version 3.2.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
license BSD
@@ -20,17 +20,19 @@
master_sites http://www.cmake.org/files/v${branch}/
platforms darwin freebsd
-checksums rmd160 2693ac550a2e08fbc34601e5d8b60f2abec99d1f \
- sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0
+checksums rmd160 8c102bce34d3c9ccb328ec8b629dcc91142a7243 \
+ sha256 759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c
-depends_lib-append port:libidn \
- port:openssl \
- port:curl \
+depends_lib-append port:curl \
port:expat \
port:zlib \
port:bzip2 \
port:libarchive
+# CMake 3.2 changed dependency requirements to include jsoncpp.
+# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
+# use its internal jsoncpp until a better solution comes about.
+
patchfiles patch-CMakeFindFrameworks.cmake.diff \
patch-Modules-FindFreetype.cmake.diff \
patch-Modules-FindQt4.cmake.diff \
@@ -57,7 +59,8 @@
configure.args --docdir=share/doc/cmake \
--parallel=${build.jobs} \
--init=${worksrcpath}/macports.cmake \
- --system-libs
+ --system-libs \
+ --no-system-jsoncpp
configure.universal_args
configure.post_args
@@ -88,6 +91,8 @@
}
}
+build.post_args VERBOSE=ON
+
post-patch {
# copy cmake init file, ready to be patched below
copy ${filespath}/macports.cmake ${worksrcpath}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150317/001e73d3/attachment-0001.html>
More information about the macports-changes
mailing list