<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[143049] trunk/dports/devel/cmake</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/143049">143049</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-12-02 07:12:19 -0800 (Wed, 02 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake:
+ update devel to 20151201 (gc9515);
+ tweak macports.cmake settings to specity where all dependencies files are within MacPorts, rather than allowing cmake to discover them; should address ticket #49696;
+ rev-bump release for change to macports.cmake, just in case.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<li><a href="#trunkdportsdevelcmakefilesmacportscmake">trunk/dports/devel/cmake/files/macports.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (143048 => 143049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2015-12-02 15:00:11 UTC (rev 143048)
+++ trunk/dports/devel/cmake/Portfile 2015-12-02 15:12:19 UTC (rev 143049)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> # release
</span><span class="cx">
</span><span class="cx"> version ${branch}.0
</span><ins>+ revision 1
</ins><span class="cx"> checksums rmd160 95d3d0cd86e17c249459975eb9b293a5075ae87a \
</span><span class="cx"> sha256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
</span><span class="cx">
</span><span class="lines">@@ -47,12 +48,12 @@
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> # devel
</span><del>- version 20151116
</del><ins>+ version 20151201
</ins><span class="cx"> set dist_branch 3.4
</span><del>- set dist_date 20151116
- set dist_hash g89134
- checksums rmd160 6140db936ca93e0718d58694cdf8651c783cb907 \
- sha256 60cccf1952cc3faf9e7e3312ac9b7239b06cb22f0a4e24bef89b3fc901ae5474
</del><ins>+ set dist_date 20151201
+ set dist_hash gc9515
+ checksums rmd160 a27c5afbd6acec1381b3f54986a887dbaa99e15f \
+ sha256 8b958679f939351a5129a178575183e0061b2f0685f6f8811a8a2ae720f1b249
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.cmake.org/files/dev/
</span><span class="cx"> distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilesmacportscmake"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/macports.cmake (143048 => 143049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/macports.cmake 2015-12-02 15:00:11 UTC (rev 143048)
+++ trunk/dports/devel/cmake/files/macports.cmake 2015-12-02 15:12:19 UTC (rev 143049)
</span><span class="lines">@@ -1,6 +1,32 @@
</span><del>-# Coerce CMake to use the MacPorts ncurses library
</del><span class="cx"> # patch __PREFIX__ in the Portfile post-patch stage
</span><ins>+
+# Coerge CMake to use MacPorts' BZIP2
+set(BZIP2_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The BZIP2 include directory" FORCE)
+set(BZIP2_LIBRARY_RELEASE "__PREFIX__/lib/libbz2.dylib" CACHE FILEPATH "The BZIP2 Release Library" FORCE)
+set(BZIP2_LIBRARY_DEBUG "BZIP2_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The BZIP2 Debug Library" FORCE)
+
+# Coerge CMake to use MacPorts' CURL
+set(CURL_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The CURL include directory" FORCE)
+set(CURL_LIBRARY "__PREFIX__/lib/libcurl.dylib" CACHE FILEPATH "The CURL Library" FORCE)
+
+# Coerce CMake to use MacPorts' CURSES / NCURSES
+set(CURSES_INCLUDE_PATH "__PREFIX__/include" CACHE PATH "The Curses Include Directory" FORCE)
</ins><span class="cx"> set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
</span><ins>+set(CURSES_FORM_LIBRARY "__PREFIX__/lib/libform.dylib" CACHE FILEPATH "The Form Library" FORCE)
+set(CURSES_NCURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The NCurses Library" FORCE)
</ins><span class="cx">
</span><del>-# Coerce CMake to use the correct Python Executable
</del><ins>+# Coerge CMake to use MacPorts' EXPAT
+set(EXPAT_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The EXPAT include directory" FORCE)
+set(EXPAT_LIBRARY "__PREFIX__/lib/libexpat.dylib" CACHE FILEPATH "The EXPAT Library" FORCE)
+
+# Coerge CMake to use MacPorts' LibArchive
+set(LibArchive_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The LibArchive include directory" FORCE)
+set(LibArchive_LIBRARY "__PREFIX__/lib/libarchive.dylib" CACHE FILEPATH "The LibArchive Library" FORCE)
+
+# Coerce CMake to use MacPorts' Python Executable
</ins><span class="cx"> set(PYTHON_EXECUTABLE "__PREFIX__/bin/python__PYTHON_VERSION_WITH_DOT__" CACHE FILEPATH "The Python Executable to use" FORCE)
</span><ins>+
+# Coerge CMake to use MacPorts' ZLIB
+set(ZLIB_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The ZLIB include directory" FORCE)
+set(ZLIB_LIBRARY_RELEASE "__PREFIX__/lib/libz.dylib" CACHE FILEPATH "The ZLIB Release Library" FORCE)
+set(ZLIB_LIBRARY_DEBUG "ZLIB_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The ZLIB Debug Library" FORCE)
</ins></span></pre>
</div>
</div>
</body>
</html>