diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-19 06:59:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-19 06:59:12 -0700 |
| commit | 22924134e76d624ab59f1439a2998bc2e5882567 (patch) | |
| tree | 3f15dd94e90b3712ea9f5ba67c22a41826e3e195 /gr-uhd | |
| parent | f7c8e9b5cbb49f659b14c9a6119345b7fa15507c (diff) | |
| parent | 8223ae4eeec5fcbfaaa3f246595fa1b29abe4b0e (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 0ad4618d5a..d58f0dd01c 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -21,10 +21,10 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${UHD_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${UHD_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt index 4cfa77d1d5..866e5f1f12 100644 --- a/gr-uhd/swig/CMakeLists.txt +++ b/gr-uhd/swig/CMakeLists.txt @@ -26,9 +26,9 @@ 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} + ${UHD_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) |