diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2016-09-19 09:31:11 -0400 |
|---|---|---|
| committer | Michael Dickens <michael.dickens@ettus.com> | 2016-09-19 09:31:11 -0400 |
| commit | 7ee482848acdb467c1b8458c64277924a1f1d098 (patch) | |
| tree | f32ef3d3c57499a969b15a3a3336c283c8d659ee /gr-uhd | |
| parent | d57a138e335dd71c2b0264eb13e2e0fc84a7a541 (diff) | |
uhd: re-Fix order of include dirs done in 7ad6ff1b such that UHD_INCLUDE_DIRS comes before Boost but after all internal directories.
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 b30a0d6b07..be77e22556 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 163ca8f638..35f753c1fa 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} ) |