[72509] trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

[michaelld at macports.org]

Revision: 72509
          http://trac.macports.org/changeset/72509
Author:   michaelld at macports.org
Date:     2010-10-18 14:11:47 -0700 (Mon, 18 Oct 2010)
Log Message:
-----------
Corrected a couple typos; added ZLIB library to Qt CMake standard arguments.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-10-18 20:29:43 UTC (rev 72508)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-10-18 21:11:47 UTC (rev 72509)
@@ -29,7 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #
-# This portgroup defined standard settings when using Qt4.
+# This portgroup defines standard settings when using Qt4.
 #
 # Usage:
 # PortGroup     qt4 1.0
@@ -53,7 +53,7 @@
 set qt_imports_dir      ${qt_dir}/share/${qt_name}/imports
 
 # standard Qt includes directory
-set qt_includes_dir     ${qt_dir}/includes
+set qt_includes_dir     ${qt_dir}/include
 
 # standard Qt libraries directory
 set qt_libs_dir         ${qt_dir}/lib
@@ -91,7 +91,8 @@
 # standard cmake info for Qt4
 set qt_cmake_defines    "-DQT_QT_INCLUDE_DIR=${qt_includes_dir} \
                          -DQT_LIBRARY_DIR=${qt_libs_dir} \
-                         -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd}"
+                         -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd} \
+                         -DQT_ZLIB_LIBRARY:FILEPATH=${prefix}/lib/libz.dylib"
 
 # allow for both qt4 and qt4 devel
 depends_lib-append      bin:qmake:qt4-mac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101018/62b9391d/attachment.html>