[79681] trunk/dports/math/eigen3/Portfile

[eborisch at macports.org]

Revision: 79681
          http://trac.macports.org/changeset/79681
Author:   eborisch at macports.org
Date:     2011-06-23 07:48:00 -0700 (Thu, 23 Jun 2011)
Log Message:
-----------
eigen3: Re-name variants as requested in http://lists.macosforge.org/pipermail/macports-dev/2011-June/015029.html

Modified Paths:
--------------
    trunk/dports/math/eigen3/Portfile

Modified: trunk/dports/math/eigen3/Portfile
===================================================================
--- trunk/dports/math/eigen3/Portfile	2011-06-23 08:47:30 UTC (rev 79680)
+++ trunk/dports/math/eigen3/Portfile	2011-06-23 14:48:00 UTC (rev 79681)
@@ -1,7 +1,6 @@
 # $Id$
 
 PortSystem          1.0
-#PortGroup           cmake 1.0
 
 name                eigen3
 version             3.0.1
@@ -26,6 +25,9 @@
 universal_variant   yes
 configure.universal_args  ""
 
+# Install via CMake by default. Slower than a header-only install, but makes other CMake-based builds happy
+default_variants     +cmake
+
 # Variants
 variant gcc44 description { Use MacPorts' gcc44 compilers } conflicts gcc45 {
   configure.compiler  macports-gcc-4.4
@@ -35,23 +37,20 @@
   configure.compiler  macports-gcc-4.5
 }
 
-variant doc description { Place local documentation into <prefix>/share/doc/eigen3/html } conflicts no_cmake {
+variant doc description { Place local documentation into <prefix>/share/doc/eigen3/html } requires cmake {
   depends_build-append port:doxygen port:texlive-latex
   build.target-append doc
 }
 
-variant blas description { Build eigen-based blas (libeigen_blas*) } conflicts no_cmake {
+variant blas description { Build eigen-based blas (libeigen_blas*) } requires cmake {
   if {![variant_isset gcc44] && ![variant_isset gcc45]} {
-    ui_error "eigen3 +blas needs either +gcc44 or +gcc45 enabled!"
+    ui_error "eigen3: ##### +blas needs either +gcc44 or +gcc45 enabled #####"
     return -code error
   } else {
     build.target-append blas
   }
 }
 
-variant no_cmake description { Header-only install: Removes CMake dependency, breaks FindEigen3.cmake } {
-}
-
 # Phase modifications
 # Move source into eigen_src; configure & build (out-of-source) in ${worksrcpath}
 post-extract {
@@ -89,9 +88,9 @@
   }
 }
 
-
+# Conditional phase modifications
 # Are we doing a header-only or cmake (for 'port test' or +doc/+blas) build?
-if {[variant_isset no_cmake]} {
+if {![variant_isset cmake]} {
   # We can skip everything and just copy the headers -- fast!
   use_configure       no
   build {}
@@ -105,9 +104,11 @@
   # Fail with message if user tries to test
   test.run            yes
   test {
-    ui_error "!!! TESTING IS UNSUPPORTED WITH +no_cmake VARIANT !!!"
+    ui_error "!!! TESTING IS UNSUPPORTED WITHOUT +cmake VARIANT !!!"
   }
-} else {
+}
+
+variant cmake description { CMake-based install: Disabling removes CMake support } {
   PortGroup           muniversal 1.0
   # Not using cmake portgroup as it sets -DCMAKE_OSX_ARCHITECTURES
   # in a way we don't seem to be able disable.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110623/ffcf708e/attachment.html>