diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:50:08 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:50:08 -0700 |
| commit | e5e1b0f5b64073632a27d711c06a75728596670e (patch) | |
| tree | e2bb450e1bc1c4e492763adb284b5e9c9dd6d6d9 /gr-uhd | |
| parent | 222fd4391a39873b5e114f3d30d47608a658b090 (diff) | |
| parent | 95ccf0b099f88d0e3b97f7025743091c42cb90d3 (diff) | |
Merge branch 'master' into next
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 2427516c9a..0ad4618d5a 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 5cbc6c642c..4cfa77d1d5 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) |