[99818] trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

[ryandesign at macports.org]

Revision: 99818
          https://trac.macports.org/changeset/99818
Author:   ryandesign at macports.org
Date:     2012-11-18 02:06:03 -0800 (Sun, 18 Nov 2012)
Log Message:
-----------
cmake-1.0.tcl: rearrange the universal test

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

Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-11-18 10:02:49 UTC (rev 99817)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-11-18 10:06:03 UTC (rev 99818)
@@ -57,12 +57,13 @@
 
 platform darwin {
     pre-configure {
-        if {![variant_isset universal] || ![variant_exists universal]} {
+        if {[variant_exists universal] && [variant_isset universal]} {
+            configure.universal_args-append \
+                -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
+        } else {
             configure.args-append \
                 -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
         }
-        configure.universal_args-append \
-            -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
         if {${configure.sdkroot} != ""} {
             configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
         } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121118/25816807/attachment.html>