All json configs are currentlyworking, updated signals as needed.

gr-vt · May 1, 2017 · 04f6082 · 04f6082
1 parent f1b95a3
commit 04f6082
Show file tree

Hide file tree

Showing 30 changed files with 3,343 additions and 1,518 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,7 +109,7 @@ find_package(Doxygen)
 # components required to the list of GR_REQUIRED_COMPONENTS (in all
 # caps such as FILTER or FFT) and change the version to the minimum
 # API compatible version required.
-set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS DIGITAL ANALOG FILTER UHD CHANNELS)
+set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER DIGITAL ANALOG CHANNELS UHD)
 find_package(Gnuradio "3.7.2" REQUIRED)
 
 if(NOT CPPUNIT_FOUND)

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -22,12 +22,20 @@ include(GrPlatform) #define LIB_SUFFIX
 include_directories(${CMAKE_INSTALL_PREFIX}/include/)
 link_directories(${CMAKE_INSTALL_PREFIX}/lib/)
 
-add_executable(Signal_Exciter_File Signal_Exciter_File.cpp)
+#add_executable(Signal_Exciter_File Signal_Exciter_File.cpp)
+#target_link_libraries(Signal_Exciter_File
+#	${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}
+#	${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_DIGITAL_LIBRARIES}
+#	${GNURADIO_CHANNELS_LIBRARIES}
+#	gnuradio-signal_exciter ${Boost_LIBRARIES} fftw3 fftw3f config)
+
+
+add_executable(Signal_Exciter_File Signal_Exciter_File_v2.cpp)
 target_link_libraries(Signal_Exciter_File
-	${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}
+	jsoncpp ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}
 	${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_DIGITAL_LIBRARIES}
 	${GNURADIO_CHANNELS_LIBRARIES}
-	gnuradio-signal_exciter ${Boost_LIBRARIES} fftw3 fftw3f config)
+  gnuradio-signal_exciter ${Boost_LIBRARIES} fftw3 fftw3f)
 
 include(GrPython)