diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:27:23 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:27:23 -0700 |
| commit | 98fcf6344761404332208a14f85762e2968f70c3 (patch) | |
| tree | 3ec25ba3ce65504f455eb776b913d203527b7444 /gr-uhd | |
| parent | da0a102e9b076db83fe5a63b3730ac39b588eb92 (diff) | |
| parent | 7ad6ff1b3e3d6d078ad7fb223faa72b36d311d37 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index b57b80b557..b30a0d6b07 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -21,12 +21,12 @@ # Setup the include and linker paths ######################################################################## include_directories( + ${UHD_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${UHD_INCLUDE_DIRS} ) link_directories( diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt index ef54761d0f..163ca8f638 100644 --- a/gr-uhd/swig/CMakeLists.txt +++ b/gr-uhd/swig/CMakeLists.txt @@ -26,10 +26,10 @@ include(GrSwig) set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i set(GR_SWIG_INCLUDE_DIRS + ${UHD_INCLUDE_DIRS} ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${UHD_INCLUDE_DIRS} ) if(ENABLE_GR_CTRLPORT) |