Merging master to get srsgui include dir fix

This commit is contained in:
Paul Sutton 2015-05-27 14:58:01 +01:00
commit 3c7cebb86c
2 changed files with 2 additions and 1 deletions

View File

@ -32,7 +32,7 @@ Download & Install Instructions
* Optional requirements: * Optional requirements:
* srsgui: for real-time plotting. Download it here: https://github.com/srslte/srsgui * srsgui: for real-time plotting. Download it here: https://github.com/srslte/srsgui
* VOLK: if the VOLK library and headers are detected, they will be used for accelerating some signal processing functions. * VOLK: if the VOLK library and headers are detected, they will be used for accelerating some signal processing functions.
* Matlab/Octave: if found by CMake, MEX files will also be generated and installed. If you find any compilation issue with MEX and you don't need them, pass -DDisableMex=ON to cmake to disable them. * Matlab/Octave: if found by CMake, MEX files will also be generated and installed. If you find any compilation issue with MEX and you don't need them, pass -DDisableMEX=ON to cmake to disable them.
Download and build srsLTE: Download and build srsLTE:
``` ```

View File

@ -59,6 +59,7 @@ ENDIF(UHD_FOUND)
FIND_PACKAGE(SRSGUI) FIND_PACKAGE(SRSGUI)
IF(SRSGUI_FOUND) IF(SRSGUI_FOUND)
include_directories(${SRSGUI_INCLUDE_DIRS})
target_link_libraries(pdsch_ue ${SRSGUI_LIBRARIES}) target_link_libraries(pdsch_ue ${SRSGUI_LIBRARIES})
ELSE(SRSGUI_FOUND) ELSE(SRSGUI_FOUND)
add_definitions(-DDISABLE_GRAPHICS) add_definitions(-DDISABLE_GRAPHICS)