diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-19 06:56:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-19 06:56:46 -0700 |
| commit | 8223ae4eeec5fcbfaaa3f246595fa1b29abe4b0e (patch) | |
| tree | 171eb1226b55eebf5a102a8b94694d0ee4adad6f | |
| parent | 98c56507fd63bb485d3116ab1ce94702c8a00cee (diff) | |
| parent | 7ee482848acdb467c1b8458c64277924a1f1d098 (diff) | |
Merge remote-tracking branch 'michaelld/refix_uhd_include_order'
| -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} ) |