[Commit-gnuradio] [gnuradio] 04/07: uhd: re-Fix order of include dirs done in 7ad6ff1b such that UHD_INCLUDE_DIRS comes before Boost but after all internal directories.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7ee482848acdb467c1b8458c64277924a1f1d098
Author: Michael Dickens <address@hidden>
Date:   Mon Sep 19 09:31:11 2016 -0400

    uhd: re-Fix order of include dirs done in 7ad6ff1b such that 
UHD_INCLUDE_DIRS comes before Boost but after all internal directories.
---
 gr-uhd/lib/CMakeLists.txt  | 2 +-
 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 b30a0d6..be77e22 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 163ca8f..35f753c 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}
 )