trondeau/gnuradio — pull request #10 by michaelld (2013-05-17 13:13:43+00:00)
Title: Next fix inc order

Hi Tom - I'm trying the "github" way of doing edits to GNU Radio; please let me know if this works! I had some time so I worked over the latest NEXT branch to re-do header include directory ordering so that this branch will compile even if a prior version of GNU Radio is already installed (as happens when using MacPorts and doing an "upgrade").

The last remaining issue is above my pay grade: In gnuradio-runtime/swig/CMakeLists.txt, there are 2 commands to "GR_SWIG_MAKE", and (to the best of my understanding) this means that any "list(APPEND ..." or "include_directories" therein will be issued twice. I think since all of the -first- set of "-I..." are in the correct ordering, and since all of the included headers will be found through that set, that it's not an important issue to fix -- though if you're a "perfectionist" it'll probably get under your skin. This is the only place in the whole GNU Radio trunk where this command is issued twice.

Otherwise, to the best of my testing this patch fixes all of the include path ordering to be correct again for the next branch only. I have tested this on OSX only, but I expect it will work on other systems too since the changes are CMake only. - MLD