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

[ryandesign at macports.org]

Revision: 99819
          https://trac.macports.org/changeset/99819
Author:   ryandesign at macports.org
Date:     2012-11-18 02:37:48 -0800 (Sun, 18 Nov 2012)
Log Message:
-----------
cmake-1.0.tcl: set CMAKE_OSX_ARCHITECTURES correctly when also using muniversal portgroup (#36975)

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:06:03 UTC (rev 99818)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-11-18 10:37:48 UTC (rev 99819)
@@ -58,8 +58,15 @@
 platform darwin {
     pre-configure {
         if {[variant_exists universal] && [variant_isset universal]} {
-            configure.universal_args-append \
-                -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
+            if {[info exists universal_archs_supported]} {
+                global merger_configure_args
+                foreach arch ${universal_archs_to_use} {
+                    lappend merger_configure_args(${arch}) -DCMAKE_OSX_ARCHITECTURES=${arch}
+                }
+            } else {
+                configure.universal_args-append \
+                    -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
+            }
         } else {
             configure.args-append \
                 -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121118/2be42e72/attachment-0001.html>