Changeset 79681

Timestamp:

06/23/11 07:48:00 (4 years ago)

Author:

eborisch@…

Message:

eigen3: Re-name variants as requested in ​http://lists.macosforge.org/pipermail/macports-dev/2011-June/015029.html

File:

• trunk/dports/math/eigen3/Portfile (modified) (5 diffs)

trunk/dports/math/eigen3/Portfile

@@ -2 +2 @@
 
 PortSystem          1.0
-#PortGroup           cmake 1.0
 
 name                eigen3
@@ -27 +26 @@
 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 {
@@ -36 +38 @@
 }
 
-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 } {
 }
 
@@ -90 +89 @@
 }
 
-
+# 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
@@ -106 +105 @@
   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