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

[nicos at macports.org]

Revision: 119436
          https://trac.macports.org/changeset/119436
Author:   nicos at macports.org
Date:     2014-04-25 06:10:38 -0700 (Fri, 25 Apr 2014)
Log Message:
-----------
cmake-1.0.tcl: set deployment target and sdk root variables according to user's system (ticket #41321)

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-04-25 12:55:25 UTC (rev 119435)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2014-04-25 13:10:38 UTC (rev 119436)
@@ -116,10 +116,22 @@
                 -DCMAKE_OSX_ARCHITECTURES="${configure.build_arch}"
         }
         if {${configure.sdkroot} != ""} {
-            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
+            configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}" -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}" 
         } else {
-            # Witout this, cmake will choose an SDK and deployment target on its own.
-            configure.args-append -DCMAKE_OSX_SYSROOT=/ -DCMAKE_OSX_DEPLOYMENT_TARGET=""
+            # 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 {$macosx_deployment_target eq "10.4"} {
+                set sdk ${sdks_dir}/MacOSX10.4u.sdk
+            } else {
+                set sdk ${sdks_dir}/MacOSX${macosx_deployment_target}.sdk
+            }
+            configure.args-append \
+                -DCMAKE_OSX_SYSROOT="${sdk}" \
+                -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}" 
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140425/6fd23341/attachment.html>