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

ryandesign at macports.org ryandesign at macports.org
Sun Nov 18 01:44:48 PST 2012


Revision: 99814
          https://trac.macports.org/changeset/99814
Author:   ryandesign at macports.org
Date:     2012-11-18 01:44:48 -0800 (Sun, 18 Nov 2012)
Log Message:
-----------
cmake-1.0.tcl: put the whole pre-configure block in a "platform darwin" block because everything it does is concerned with OSX variables

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	2012-11-18 09:33:28 UTC (rev 99813)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2012-11-18 09:44:48 UTC (rev 99814)
@@ -1,8 +1,8 @@
 # -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
-
+#
 # Copyright (c) 2009 Orville Bennett <illogical1 at gmail.com>
-# Copyright (c) 2010 The MacPorts Project
+# Copyright (c) 2010-2012 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -55,8 +55,9 @@
                     -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
                     -Wno-dev
 
+platform darwin {
 pre-configure {
-    if {${os.platform} == "darwin" && (![variant_isset universal] || ![variant_exists universal])} {
+        if {![variant_isset universal] || ![variant_exists universal]} {
         configure.args-append \
             -DCMAKE_OSX_ARCHITECTURES=\"${configure.build_arch}\"
     }
@@ -66,6 +67,7 @@
         configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
     } else {
         configure.args-append -DCMAKE_OSX_SYSROOT=/
+        }
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121118/04a1da66/attachment.html>


More information about the macports-changes mailing list