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

[michaelld at macports.org]

Revision: 72483
          http://trac.macports.org/changeset/72483
Author:   michaelld at macports.org
Date:     2010-10-17 12:12:31 -0700 (Sun, 17 Oct 2010)
Log Message:
-----------
Remove configure arg for QT_QMAKE_EXECUTABLE since not all CMake ports
use Qt; move it into qt4's portgroup, as an easily added variable.

Add in ${prefix}/share/cmake/modules path for CMake modules not
installed by CMake or some other port (e.g., kdelibs).

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	2010-10-17 19:08:11 UTC (rev 72482)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2010-10-17 19:12:31 UTC (rev 72483)
@@ -1,6 +1,7 @@
 # $Id$
 
 # Copyright (c) 2009 Orville Bennett <illogical1 at gmail.com>
+# Copyright (c) 2010 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,8 +33,10 @@
 # Usage:
 # PortGroup     cmake 1.0
 
+# standard place to install extra CMake modules
+set cmake_share_module_dir ${prefix}/share/cmake/modules
 
-depends_build       port:cmake
+depends_build-append port:cmake
 
 #FIXME: ccache works with cmake on linux
 configure.ccache    no
@@ -48,8 +51,9 @@
                     -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
                     -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
-                    -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \
+                    -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
                     -Wno-dev
+
 pre-configure {
     if {${os.platform} == "darwin" && (![variant_isset universal] || ![variant_exists universal])} {
         configure.args-append \
@@ -58,6 +62,7 @@
     configure.universal_args-append \
         -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\"
 }
+
 configure.universal_args-delete --disable-dependency-tracking
 if {[info exists configure.sdkroot] && ${configure.sdkroot} != ""} {
     configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101017/e1f085a6/attachment.html>