[72482] trunk/dports/_resources/port1.0/group/kde4-1.1.tcl

[michaelld at macports.org]

Revision: 72482
          http://trac.macports.org/changeset/72482
Author:   michaelld at macports.org
Date:     2010-10-17 12:08:11 -0700 (Sun, 17 Oct 2010)
Log Message:
-----------
Better way to handle CMAKE_MODULE_PATH configure argument.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/kde4-1.1.tcl

Modified: trunk/dports/_resources/port1.0/group/kde4-1.1.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2010-10-17 18:56:01 UTC (rev 72481)
+++ trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2010-10-17 19:08:11 UTC (rev 72482)
@@ -83,10 +83,13 @@
     }
 }
 
-# create the CMake module lookup path
-set cmake_module_path ${qt_cmake_module_dir}
+# augment the CMake module lookup path, if necessary depending on
+# where Qt4 is installed.
 if {${qt_dir} != ${prefix}} {
-    set cmake_module_path ${prefix}/share/cmake/modules\;${cmake_module_path}
+    set cmake_module_path ${cmake_share_module_dir}\;${qt_cmake_module_dir}
+    configure.args-delete -DCMAKE_MODULE_PATH=${cmake_share_module_dir}
+    configure.args-append -DCMAKE_MODULE_PATH="${cmake_module_path}"
+    unset cmake_module_path
 }
 
 # standard configure args; virtuall all KDE ports use CMake and Qt4
@@ -94,11 +97,8 @@
                         -DBUILD_SHARED_LIBS=ON \
                         -DBUNDLE_INSTALL_DIR=${applications_dir}/KDE4 \
                         -DKDE_DISTRIBUTION_TEXT="MacPorts\/Mac OS X" \
-                        ${qt_cmake_defines} \
-                        -DCMAKE_MODULE_PATH="${cmake_module_path}"
+                        ${qt_cmake_defines}
 
-unset cmake_module_path
-
 # standard variant for building documentation
 variant docs description "Build documentation" {
     depends_lib-append      port:doxygen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101017/9d484ff0/attachment.html>