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

[pixilla at macports.org]

Revision: 79057
          http://trac.macports.org/changeset/79057
Author:   pixilla at macports.org
Date:     2011-05-31 07:41:23 -0700 (Tue, 31 May 2011)
Log Message:
-----------
_resources/port1.0/group/qt4-1.0.tcl: Add qt_qmake_spec var with value macx-g++.
Add qmake QMAKESPEC env var to configure.env, build.env, destroot.env and cmake with value of qt_qmake_spec.

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	2011-05-31 10:52:37 UTC (rev 79056)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2011-05-31 14:41:23 UTC (rev 79057)
@@ -124,6 +124,10 @@
 global qt_qmake_cmd
 set qt_qmake_cmd        ${qt_dir}/bin/qmake
 
+# standard qmake spec
+global qt_qmake_spec
+set qt_qmake_spec       macx-g++
+
 # standard moc command location
 global qt_moc_cmd
 set qt_moc_cmd          ${qt_dir}/bin/moc
@@ -144,6 +148,7 @@
 global qt_cmake_defines
 set qt_cmake_defines    \
     "-DQT_QT_INCLUDE_DIR=${qt_includes_dir} \
+     -DQT_QMAKESPEC=${qt_qmake_spec} \
      -DQT_ZLIB_LIBRARY=${prefix}/lib/libz.dylib \
      -DQT_PNG_LIBRARY=${prefix}/lib/libpng.dylib"
 
@@ -159,6 +164,7 @@
 # standard configure environment
 configure.env-append    QTDIR=${qt_dir} \
                         QMAKE=${qt_qmake_cmd} \
+                        QMAKESPEC=${qt_qmake_spec} \
                         MOC=${qt_moc_cmd}
 
 if {${qt_dir} != ${prefix}} {
@@ -168,6 +174,7 @@
 # standard build environment
 build.env-append        QTDIR=${qt_dir} \
                         QMAKE=${qt_qmake_cmd} \
+                        QMAKESPEC=${qt_qmake_spec} \
                         MOC=${qt_moc_cmd}
 
 if {${qt_dir} != ${prefix}} {
@@ -180,6 +187,7 @@
 # standard destroot environment
 destroot.env-append     QTDIR=${qt_dir} \
                         QMAKE=${qt_qmake_cmd} \
+                        QMAKESPEC=${qt_qmake_spec} \
                         MOC=${qt_moc_cmd} \
                         INSTALL_ROOT=${destroot} \
                         DESTDIR=${destroot}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110531/10e50684/attachment.html>