Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).

4 files changed, 25 insertions, 21 deletions

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 2f06791ca..0a4ea3c30 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -45,8 +45,6 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
 
 include(GrMiscUtils)
 GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
-    ${Boost_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS} #headers depend on gruel
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
     ${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general
@@ -61,7 +59,6 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
-    ${Boost_INCLUDE_DIRS}
 )
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index 9c980157d..89a1bad88 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -41,14 +41,18 @@ list(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
-include_directories(${VOLK_INCLUDE_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+include_directories(
+	${GNURADIO_CORE_INCLUDE_DIRS}
+	${VOLK_INCLUDE_DIRS}
+        ${GRUEL_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS}
+	${FFTW3F_INCLUDE_DIRS}
+)
 
-include_directories(${FFTW3F_INCLUDE_DIRS})
-link_directories(${FFTW3F_LIBRARY_DIRS})
+link_directories(
+	${Boost_LIBRARY_DIRS}
+	${FFTW3F_LIBRARY_DIRS}
+)
 
 ########################################################################
 # Setup library
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index 734547131..d8a64cc0f 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -21,16 +21,16 @@
 include(GrPython)
 include(GrSwig)
 
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
 set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${GRUEL_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
 set(GR_SWIG_LIBRARIES gnuradio-core)
 
+link_directories(${Boost_LIBRARY_DIRS})
+
 ########################################################################
 # Build and install the swig targets
 ########################################################################
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
index 680141e7b..dbd52f05c 100644
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ b/gnuradio-core/src/tests/CMakeLists.txt
@@ -24,14 +24,17 @@ GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-include_directories(${GRUEL_INCLUDE_DIRS})
-include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+include_directories(
+	${GNURADIO_CORE_INCLUDE_DIRS}
+	${GRUEL_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
+	${CPPUNIT_INCLUDE_DIRS}
+)
 
-include_directories(${CPPUNIT_INCLUDE_DIRS})
-link_directories(${CPPUNIT_LIBRARY_DIRS})
+link_directories(
+	${Boost_LIBRARY_DIRS}
+	${CPPUNIT_LIBRARY_DIRS}
+)
 
 ########################################################################
 # Build benchmarks and non-registered tests