[116408] trunk/dports/science/flann/Portfile

[mmoll at macports.org]

Revision: 116408
          https://trac.macports.org/changeset/116408
Author:   mmoll at macports.org
Date:     2014-01-23 15:06:45 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
science/flann: use new mpi PortGroup to add mpi variants

Modified Paths:
--------------
    trunk/dports/science/flann/Portfile

Modified: trunk/dports/science/flann/Portfile
===================================================================
--- trunk/dports/science/flann/Portfile	2014-01-23 21:57:37 UTC (rev 116407)
+++ trunk/dports/science/flann/Portfile	2014-01-23 23:06:45 UTC (rev 116408)
@@ -2,10 +2,11 @@
 
 PortSystem 1.0
 PortGroup cmake 1.0
+PortGroup mpi 1.0
 
 name                flann
 version             1.8.4
-revision            4
+revision            5
 categories          science devel
 maintainers         mmoll
 description         Fast Library for Approximate Nearest Neighbors
@@ -29,11 +30,15 @@
 patchfiles          patch-src-python-CMakeLists.txt.diff patch-CMakeLists.txt.diff
 patch.dir           ${worksrcpath}/${worksrcdir}
 
-# MPI support is automatically disabled if hdf5-18 is installed without the +openmpi variant
-configure.args-append ${distname} -DBUILD_MATLAB_BINDINGS=OFF -DUSE_MPI=ON -DBUILD_CUDA_LIB=OFF \
-                    -DMPIEXEC=${prefix}/lib/openmpi/bin/mpiexec \
-                    -DMPI_COMPILER=${prefix}/lib/openmpi/bin/mpic++
+mpi.setup
 
+configure.args-append ${distname} -DBUILD_MATLAB_BINDINGS=OFF -DUSE_MPI=OFF -DBUILD_CUDA_LIB=OFF
+
+if {[ mpi_variant_isset ]} {
+    configure.args-delete       -DUSE_MPI=OFF
+    configure.args-append       -DUSE_MPI=ON
+}
+
 set pythons_suffixes {26 27 31 32 33}
 
 set pythons_ports {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/a484b7db/attachment-0001.html>