casa-mp-base

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 824108d..facc660 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -57,7 +57,7 @@ set(Boost_ADDITIONAL_VERSIONS

     "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"

     "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"

 )

-find_package(Boost "1.35" COMPONENTS filesystem system)

+find_package(Boost "1.35" COMPONENTS filesystem system thread)

 if(NOT Boost_FOUND)

     message(FATAL_ERROR "Boost required to compile ofdm")

@@ -83,9 +83,8 @@ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)

 ########################################################################

 # Find gnuradio build dependencies

 ########################################################################

-#find_package(GnuradioRuntime)

 find_package(CppUnit)

-#find_package(GnuradioFFT)

+find_package(Volk)

 # To run a more advanced search for GNU Radio and it's components and

 # versions, use the following. Add any components required to the list

@@ -107,6 +106,9 @@ endif()

 if(NOT GNURADIO_BLOCKS_FOUND)

     message(FATAL_ERROR "GnuRadio Blocks required to compile ofdm")

 endif()

+if(NOT VOLK_FOUND)

+    message(FATAL_ERROR "Volk required to compile ofdm")

+endif()

 ########################################################################

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt

index a542d59..15b0430 100644

--- a/apps/CMakeLists.txt

+++ b/apps/CMakeLists.txt

@@ -24,7 +24,8 @@ GR_PYTHON_INSTALL(

     gui/ofdm_rx_gui.py

     gui/ofdm_mrrc_rx_gui.py

     gui/ofdm_tx_gui.py

-    DESTINATION bin

+    DESTINATION

+    ${CMAKE_INSTALL_PREFIX}/share/gnuradio/examples/ofdm

 )

 install(

@@ -38,7 +39,8 @@ install(

     run_usrp_tx.sh

     run_test_demapper_fbmc.sh

     run_grc.sh

-    DESTINATION bin

+    DESTINATION

+    ${CMAKE_INSTALL_PREFIX}/share/gnuradio/examples/ofdm

 )

 install(

@@ -48,5 +50,59 @@ install(

     gui/ofdm_rx_gui_window.ui

     gui/ofdm_mrrc_rx_gui_window.ui

     gui/ofdm_tx_gui_window.ui

-    DESTINATION bin

+    DESTINATION

+    ${CMAKE_INSTALL_PREFIX}/share/gnuradio/examples/ofdm

+)

+

+install(

+    FILES

+    grc/demo.grc

+    grc/demo_1tap.grc

+    grc/demo_1zero.grc

+    grc/demo_1zero_rep.grc

+    grc/demo_1zero_rep_1tap.grc

+    grc/demo_2zero.grc

+    grc/demo_3tap.grc

+    grc/demo_onlyawgn.grc

+    grc/fbmc_inner_receiver.grc

+    grc/fbmc_main.grc

+    grc/fbmc_main_coding.grc

+    grc/fbmc_main_masking_after_fft.grc

+    grc/fbmc_multiuser_debug.grc

+    grc/fbmc_multiuser_scenario.grc

+    grc/fbmc_snr_estimator.grc

+    grc/fbmc_with_extended_fft.grc

+    grc/fbmc_with_hier_blocks.grc

+    grc/paper_tigr_fbmc_inner_receiver.grc

+    grc/paper_tigr_fbmc_inner_receiver2.grc

+    grc/paper_tigr_fbmc_uncoded_transceiver.grc

+    grc/paper_tigr_ofdm_inner_receiver.grc

+    grc/paper_tigr_ofdm_uncoded_transceiver.grc