Ignore:
Timestamp:
Jul 20, 2014, 1:36:35 AM (5 years ago)
Author:
jeremyhu@…
Message:

cmake: Point sysroot to / when configure.sdkroot is unset (#44125).

File:
1 edited

Legend:

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

    r122145 r122298  
    113113                -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
    114114        }
     115
     116        configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
     117
    115118        if {${configure.sdkroot} != ""} {
    116             configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}" -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
     119            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
    117120        } else {
    118             # Without this, cmake will choose an SDK and deployment target on its own.
    119             if {[vercmp $xcodeversion 4.3] < 0} {
    120                 set sdks_dir ${developer_dir}/SDKs
    121             } else {
    122                 set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
    123             }
    124             if {${configure.sdk_version} eq "10.4"} {
    125                 set sdk ${sdks_dir}/MacOSX10.4u.sdk
    126             } else {
    127                 set sdk ${sdks_dir}/MacOSX${configure.sdk_version}.sdk
    128             }
    129             configure.args-append \
    130                 -DCMAKE_OSX_SYSROOT="${sdk}" \
    131                 -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
     121            configure.args-append -DCMAKE_OSX_SYSROOT="/"
    132122        }
    133123    }
Note: See TracChangeset for help on using the changeset viewer.