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

jeremyhu at macports.org jeremyhu at macports.org
Sat Jul 19 20:24:55 PDT 2014


Revision: 122300
          https://trac.macports.org/changeset/122300
Author:   jeremyhu at macports.org
Date:     2014-07-19 20:24:54 -0700 (Sat, 19 Jul 2014)
Log Message:
-----------
Partially revert the previous commit until cmake is fixed (#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 02:41:40 UTC (rev 122299)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2014-07-20 03:24:54 UTC (rev 122300)
@@ -118,7 +118,26 @@
         if {${configure.sdkroot} != ""} {
             configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
         } else {
-            configure.args-append -DCMAKE_OSX_SYSROOT="/"
+            # cmake seems to be unable to support building against / with a deployment target set:
+            #
+            #    "Either set CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to empty."
+            #
+            # For now, fall back on an SDK, but this is a horrible workaround and needs to be fixed.
+            # http://trac.macports.org/ticket/44125
+
+            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}"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140719/fc13ae49/attachment.html>


More information about the macports-changes mailing list