[Commit-gnuradio] [gnuradio] 01/01: cmake: abs path for external volk

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1ef31a43f8695c83b21657e90e1c012f57c420fc
Author: Sebastian Koslowski <address@hidden>
Date:   Mon Mar 30 16:15:16 2015 +0200

    cmake: abs path for external volk
---
 CMakeLists.txt                      | 2 ++
 gnuradio-runtime/lib/CMakeLists.txt | 2 +-
 gr-analog/lib/CMakeLists.txt        | 2 +-
 gr-blocks/lib/CMakeLists.txt        | 2 +-
 gr-channels/lib/CMakeLists.txt      | 2 +-
 gr-digital/lib/CMakeLists.txt       | 2 +-
 gr-dtv/lib/CMakeLists.txt           | 2 +-
 gr-fec/lib/CMakeLists.txt           | 2 +-
 gr-filter/lib/CMakeLists.txt        | 2 +-
 gr-qtgui/lib/CMakeLists.txt         | 2 +-
 gr-wxgui/lib/CMakeLists.txt         | 2 +-
 11 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5eecc18..1362ffb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,6 +295,8 @@ if(NOT VOLK_FOUND)
         ${CMAKE_CURRENT_BINARY_DIR}/volk/include
     )
 
+    set(VOLK_LIBRARIES volk)
+
     if(ENABLE_VOLK)
 
     include(GrPackage)
diff --git a/gnuradio-runtime/lib/CMakeLists.txt 
b/gnuradio-runtime/lib/CMakeLists.txt
index cdbb2b7..6d3cc41 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -132,7 +132,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
 
 list(APPEND gnuradio_runtime_libs
-    volk
+    ${VOLK_LIBRARIES}
     gnuradio-pmt
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 921b547..dfe6d03 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -96,7 +96,7 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND analog_libs
-    volk
+    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-blocks
     gnuradio-filter
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 32cc7b3..a441e02 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -235,7 +235,7 @@ ENDIF(MSVC)
 
 list(APPEND blocks_libs
     gnuradio-runtime
-    volk
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
     ${BLOCKS_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
index 17c4910..6432eef 100644
--- a/gr-channels/lib/CMakeLists.txt
+++ b/gr-channels/lib/CMakeLists.txt
@@ -66,7 +66,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND channels_libs
-    volk
+    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-filter
     gnuradio-analog
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index b3f5ee7..677a8d9 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -132,7 +132,7 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND digital_libs
-    volk
+    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-filter
     gnuradio-blocks
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index b72e7a4..ccf4592 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -102,7 +102,7 @@ list(APPEND dtv_sources
 endif(ENABLE_GR_CTRLPORT)
 
 list(APPEND dtv_libs
-    volk
+    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-analog
     gnuradio-filter
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index 3712eb7..884bb44 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -90,7 +90,7 @@ endif(MSVC)
 list(APPEND gnuradio_fec_libs
     gnuradio-blocks
     gnuradio-runtime
-    volk
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index 13b5e4c..feabe73 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -112,7 +112,7 @@ list(APPEND filter_libs
     gnuradio-runtime
     gnuradio-fft
     gnuradio-blocks
-    volk
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
 )
 
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index 57970b2..cf90762 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -148,7 +148,7 @@ list(APPEND qtgui_libs
     gnuradio-runtime
     gnuradio-fft
     gnuradio-filter
-    volk
+    ${VOLK_LIBRARIES}
     ${QWT_LIBRARIES}
     ${QT_LIBRARIES}
     ${FFTW3F_LIBRARIES}
diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt
index faa72ba..d4c2441 100644
--- a/gr-wxgui/lib/CMakeLists.txt
+++ b/gr-wxgui/lib/CMakeLists.txt
@@ -62,7 +62,7 @@ ENDIF(MSVC)
 
 list(APPEND wxgui_libs
     gnuradio-runtime
-    volk
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
     ${BLOCKS_LIBRARIES}
     ${LOG4CPP_LIBRARIES}