[116357] trunk/dports/science/apbs/Portfile

sean at macports.org sean at macports.org
Thu Jan 23 12:13:23 PST 2014


Revision: 116357
          https://trac.macports.org/changeset/116357
Author:   sean at macports.org
Date:     2014-01-23 12:13:23 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
apbs-mpi: use mpi portgroup

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

Modified: trunk/dports/science/apbs/Portfile
===================================================================
--- trunk/dports/science/apbs/Portfile	2014-01-23 20:13:19 UTC (rev 116356)
+++ trunk/dports/science/apbs/Portfile	2014-01-23 20:13:23 UTC (rev 116357)
@@ -3,7 +3,10 @@
 
 PortSystem              1.0
 PortGroup               cmake 1.0
+PortGroup               mpi 1.0
 
+compilers.choose        cc cxx
+
 name                    apbs
 subport                 apbs-mpi {}
 version                 1.4.0
@@ -41,6 +44,8 @@
 
 switch ${subport} {
     apbs {
+        compilers.setup
+
         revision                1
 
         configure.args-append   -DENABLE_MPI:BOOL=OFF
@@ -60,17 +65,31 @@
         }
     }
     apbs-mpi {
+        mpi.choose
+        mpi.setup               require
+
         revision                0
 
         description             ${description} (MPI version)
 
-        depends_lib-append      port:openmpi
         depends_run             port:apbs
 
-        configure.cc            openmpicc
-        configure.cxx           openmpicxx
-        configure.args-append   -DENABLE_MPI:BOOL=ON
+        compilers.enforce_c     apbs
 
+        if {![mpi_variant_isset]} {
+            default_variants    +mpich
+        }
+
+        pre-configure {
+            configure.cc        ${mpi.cc}
+            configure.cxx       ${mpi.cxx}
+            configure.args-append   -DENABLE_MPI:BOOL=ON \
+                    -DCMAKE_C_COMPILER=${configure.cc} \
+                    -DCMAKE_CXX_COMPILER=${configure.cxx} \
+                    -DMPI_C_COMPILER=${mpi.cc} \
+                    -DMPI_CXX_COMPILER=${mpi.cxx}
+        }
+
         destroot {
             xinstall ${worksrcpath}/bin/apbs \
                 ${destroot}${prefix}/bin/apbs-mpi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/51871876/attachment-0001.html>


More information about the macports-changes mailing list