[Commit-gnuradio] [gnuradio] 01/04: cmake: reorder VOLK library to be after all other internal ones, and before boost.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7b4d2195ca3837ba3c4bb6b62bb17bf938e7d2ee
Author: Michael Dickens <address@hidden>
Date:   Tue Mar 31 12:06:21 2015 -0400

    cmake: reorder VOLK library to be after all other internal ones, and before 
boost.
---
 gnuradio-runtime/lib/CMakeLists.txt | 2 +-
 gr-analog/lib/CMakeLists.txt        | 2 +-
 gr-channels/lib/CMakeLists.txt      | 2 +-
 gr-digital/lib/CMakeLists.txt       | 2 +-
 gr-dtv/lib/CMakeLists.txt           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnuradio-runtime/lib/CMakeLists.txt 
b/gnuradio-runtime/lib/CMakeLists.txt
index 6d3cc41..efbfa92 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -132,8 +132,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
 
 list(APPEND gnuradio_runtime_libs
-    ${VOLK_LIBRARIES}
     gnuradio-pmt
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index dfe6d03..054fa13 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -96,10 +96,10 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND analog_libs
-    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-blocks
     gnuradio-filter
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
 )
 
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
index 6432eef..52b6222 100644
--- a/gr-channels/lib/CMakeLists.txt
+++ b/gr-channels/lib/CMakeLists.txt
@@ -66,11 +66,11 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND channels_libs
-    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-filter
     gnuradio-analog
     gnuradio-blocks
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
 )
 
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 677a8d9..eb10084 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -132,11 +132,11 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND digital_libs
-    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-filter
     gnuradio-blocks
     gnuradio-analog
+    ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index ccf4592..65f50e4 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -102,11 +102,11 @@ list(APPEND dtv_sources
 endif(ENABLE_GR_CTRLPORT)
 
 list(APPEND dtv_libs
-    ${VOLK_LIBRARIES}
     gnuradio-runtime
     gnuradio-analog
     gnuradio-filter
     gnuradio-fec
+    ${VOLK_LIBRARIES}
 )
 
 #Add Windows DLL resource file if using MSVC