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

[jeremyhu at macports.org]

Revision: 122298
          https://trac.macports.org/changeset/122298
Author:   jeremyhu at macports.org
Date:     2014-07-19 18:36:35 -0700 (Sat, 19 Jul 2014)
Log Message:
-----------
cmake: Point sysroot to / when configure.sdkroot is unset (#44125).

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	2014-07-20 01:20:12 UTC (rev 122297)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2014-07-20 01:36:35 UTC (rev 122298)
@@ -112,23 +112,13 @@
             configure.args-append \
                 -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
         }
+
+        configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
+
         if {${configure.sdkroot} != ""} {
-            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}" -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}" 
+            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
         } else {
-            # Without this, cmake will choose an SDK and deployment target on its own.
-            if {[vercmp $xcodeversion 4.3] < 0} {
-                set sdks_dir ${developer_dir}/SDKs
-            } else {
-                set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
-            }
-            if {${configure.sdk_version} eq "10.4"} {
-                set sdk ${sdks_dir}/MacOSX10.4u.sdk
-            } else {
-                set sdk ${sdks_dir}/MacOSX${configure.sdk_version}.sdk
-            }
-            configure.args-append \
-                -DCMAKE_OSX_SYSROOT="${sdk}" \
-                -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}" 
+            configure.args-append -DCMAKE_OSX_SYSROOT="/"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140719/b38fb974/attachment.html>