[99888] trunk/dports/science/gnuradio/Portfile

[michaelld at macports.org]

Revision: 99888
          https://trac.macports.org/changeset/99888
Author:   michaelld at macports.org
Date:     2012-11-20 18:39:41 -0800 (Tue, 20 Nov 2012)
Log Message:
-----------
gnuradio:

* always enable VOLK, but make using ORC a variant, since gnuradio-core requires VOLK.

* make configure arguments correct for CMake, by always prepending "-D".

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2012-11-21 00:43:52 UTC (rev 99887)
+++ trunk/dports/science/gnuradio/Portfile	2012-11-21 02:39:41 UTC (rev 99888)
@@ -131,6 +131,10 @@
 configure.dir       ${workpath}/build
 build.dir           ${workpath}/build
 
+# always enable VOLK, with or without orc
+
+configure.args-append -DENABLE_VOLK=ON
+
 # set last configure argument to the reletive path
 # to the top-level cmake source
 
@@ -239,30 +243,30 @@
         port:xmlto
 
     configure.args-append \
-        ENABLE_DOXYGEN=ON \
-        ENABLE_SPHINX=ON
+        -DENABLE_DOXYGEN=ON \
+        -DENABLE_SPHINX=ON
 
 }
 
 if {![variant_isset docs]} {
 
     configure.args-append \
-        ENABLE_DOXYGEN=OFF \
-        ENABLE_SPHINX=OFF
+        -DENABLE_DOXYGEN=OFF \
+        -DENABLE_SPHINX=OFF
 
 }
 
 variant grc description "Install GNU Radio Companion" {
 
     configure.args-append \
-        ENABLE_GRC=ON
+        -DENABLE_GRC=ON
 
 }
 
 if {![variant_isset grc]} {
 
     configure.args-append \
-        ENABLE_GRC=OFF
+        -DENABLE_GRC=OFF
 
 }
 
@@ -282,7 +286,7 @@
 if {![variant_isset qtgui]} {
 
     configure.args-append \
-        ENABLE_GR_QTGUI=OFF \
+        -DENABLE_GR_QTGUI=OFF \
         -DQT_QMAKE_EXECUTABLE=
 
 }
@@ -293,14 +297,14 @@
         port:wxWidgets-devel
 
     configure.args-append \
-        ENABLE_GR_WXGUI=ON
+        -DENABLE_GR_WXGUI=ON
 
 }
 
 if {![variant_isset wxgui]} {
 
     configure.args-append \
-        ENABLE_GR_WXGUI=OFF
+        -DENABLE_GR_WXGUI=OFF
 
 }
 
@@ -310,7 +314,7 @@
         path:lib/libuhd.dylib:uhd
 
     configure.args-append \
-        ENABLE_GR_UHD=ON \
+        -DENABLE_GR_UHD=ON \
         -DUHD_INCLUDE_DIRS=${prefix}/include \
         -DUHD_LIBRARIES=${prefix}/lib/libuhd.dylib
 
@@ -319,19 +323,18 @@
 if {![variant_isset uhd]} {
 
     configure.args-append \
-        ENABLE_GR_UHD=OFF \
+        -DENABLE_GR_UHD=OFF \
         -DUHD_INCLUDE_DIRS= \
         -DUHD_LIBRARIES=
 
 }
 
-variant volk description "Install GNU Radio Volk component" {
+variant orc description "Install GNU Radio Volk with support for ORC" {
 
     depends_lib-append \
         port:orc
 
     configure.args-append \
-        ENABLE_VOLK=ON \
         -DORCC_EXECUTABLE=${prefix}/bin/orcc
 
 }
@@ -339,7 +342,6 @@
 if {![variant_isset uhd]} {
 
     configure.args-append \
-        ENABLE_VOLK=OFF \
         -DORCC_EXECUTABLE=
 
 }
@@ -357,7 +359,7 @@
 if {![variant_isset wavelet]} {
 
     configure.args-append \
-        ENABLE_GR_WAVELET=OFF
+        -DENABLE_GR_WAVELET=OFF
 
 }
 
@@ -422,7 +424,7 @@
         port:libsdl
 
     configure.args-append \
-        ENABLE_GR_VIDEO_SDL=ON \
+        -DENABLE_GR_VIDEO_SDL=ON \
         -DSDLMAIN_LIBRARY=${prefix}/lib/libSDLmain.a \
         -DSDL_INCLUDE_DIR=${prefix}/include/SDL
 
@@ -431,7 +433,7 @@
 if {![variant_isset sdl]} {
 
     configure.args-append \
-        ENABLE_GR_VIDEO_SDL=OFF \
+        -DENABLE_GR_VIDEO_SDL=OFF \
         -DSDLMAIN_LIBRARY= \
         -DSDL_INCLUDE_DIR=
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121120/eb502a56/attachment.html>