Changeset 99819


Ignore:
Timestamp:
Nov 18, 2012, 10:37:48 AM (7 years ago)
Author:
ryandesign@…
Message:

cmake-1.0.tcl: set CMAKE_OSX_ARCHITECTURES correctly when also using muniversal portgroup (#36975)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

    r99818 r99819  
    5959    pre-configure {
    6060        if {[variant_exists universal] && [variant_isset universal]} {
    61             configure.universal_args-append \
    62                 -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
     61            if {[info exists universal_archs_supported]} {
     62                global merger_configure_args
     63                foreach arch ${universal_archs_to_use} {
     64                    lappend merger_configure_args(${arch}) -DCMAKE_OSX_ARCHITECTURES=${arch}
     65                }
     66            } else {
     67                configure.universal_args-append \
     68                    -DCMAKE_OSX_ARCHITECTURES="[join ${configure.universal_archs} \;]"
     69            }
    6370        } else {
    6471            configure.args-append \
Note: See TracChangeset for help on using the changeset viewer.