[138729] trunk/dports/devel/cmake

[michaelld at macports.org]

Revision: 138729
          https://trac.macports.org/changeset/138729
Author:   michaelld at macports.org
Date:     2015-07-17 12:26:45 -0700 (Fri, 17 Jul 2015)
Log Message:
-----------
cmake*:
+ set the PYTHON_EXECUTABLE to use directly;
+ remove building QtHelp documentation, because it just does not work right now no matter the Python version used.

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-07-17 18:10:43 UTC (rev 138728)
+++ trunk/dports/devel/cmake/Portfile	2015-07-17 19:26:45 UTC (rev 138729)
@@ -145,6 +145,14 @@
     # patch PREFIX
     reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/macports.cmake
     reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
+
+    # patch Python Version
+    if {[variant_isset python27]} {
+        set PYTHON_VERSION_WITH_DOT "2.7"
+    } else {
+        set PYTHON_VERSION_WITH_DOT "3.4"
+    }
+    reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
 }
 
 post-destroot {
@@ -250,15 +258,6 @@
         --sphinx-build=${prefix}/bin/sphinx-build-3.4
 }
 
-if {[variant_isset gui] && [variant_isset docs]} {
-    # Qt help docs seem to work only with Python 2.7
-    # as of 3.2.3 and 20150715.
-    if {[variant_isset python27]} {
-        configure.args-append \
-            --sphinx-qthelp
-    }
-}
-
 if {[variant_isset docs]} {
     if {![variant_isset python27] && ![variant_isset python34]} {
         default_variants +python27

Modified: trunk/dports/devel/cmake/files/macports.cmake
===================================================================
--- trunk/dports/devel/cmake/files/macports.cmake	2015-07-17 18:10:43 UTC (rev 138728)
+++ trunk/dports/devel/cmake/files/macports.cmake	2015-07-17 19:26:45 UTC (rev 138729)
@@ -1,3 +1,6 @@
 # Coerce CMake to use the MacPorts ncurses library
 # patch __PREFIX__ in the Portfile post-patch stage
 set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
+
+# Coerce CMake to use the correct Python Executable
+set(PYTHON_EXECUTABLE "__PREFIX__/bin/python__PYTHON_VERSION_WITH_DOT__" CACHE FILEPATH "The Python Executable to use" FORCE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150717/291411be/attachment.html>