[143049] trunk/dports/devel/cmake

[michaelld at macports.org]

Revision: 143049
          https://trac.macports.org/changeset/143049
Author:   michaelld at macports.org
Date:     2015-12-02 07:12:19 -0800 (Wed, 02 Dec 2015)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/cmake/files/macports.cmake

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- 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)
@@ -30,6 +30,7 @@
     # release
 
     version         ${branch}.0
+    revision        1
     checksums       rmd160 95d3d0cd86e17c249459975eb9b293a5075ae87a \
                     sha256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
 
@@ -47,12 +48,12 @@
 } else {
 
     # devel
-    version         20151116
+    version         20151201
     set dist_branch 3.4
-    set dist_date   20151116
-    set dist_hash   g89134
-    checksums       rmd160 6140db936ca93e0718d58694cdf8651c783cb907 \
-                    sha256 60cccf1952cc3faf9e7e3312ac9b7239b06cb22f0a4e24bef89b3fc901ae5474
+    set dist_date   20151201
+    set dist_hash   gc9515
+    checksums       rmd160 a27c5afbd6acec1381b3f54986a887dbaa99e15f \
+                    sha256 8b958679f939351a5129a178575183e0061b2f0685f6f8811a8a2ae720f1b249
 
     master_sites    http://www.cmake.org/files/dev/
     distname        ${name}-${dist_branch}.${dist_date}-${dist_hash}

Modified: trunk/dports/devel/cmake/files/macports.cmake
===================================================================
--- 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)
@@ -1,6 +1,32 @@
-# Coerce CMake to use the MacPorts ncurses library
 # patch __PREFIX__ in the Portfile post-patch stage
+
+# 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)
 set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
+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)
 
-# Coerce CMake to use the correct Python Executable
+# 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
 set(PYTHON_EXECUTABLE "__PREFIX__/bin/python__PYTHON_VERSION_WITH_DOT__" CACHE FILEPATH "The Python Executable to use" FORCE)
+
+# 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/a52c66eb/attachment.html>