From e788c523d4f8de3efd64a64f148ac1bf25ea032d Mon Sep 17 00:00:00 2001
From: Michael L Dickens
Date: Tue, 1 Jan 2013 21:42:23 -0500
Subject: 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).

---
 gr-qtgui/lib/CMakeLists.txt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'gr-qtgui/lib')

diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index 2dc35e81c..49fa525d7 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2011,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -62,17 +62,20 @@ set(qtgui_srcs
 # Setup the include and linker paths
 ########################################################################
 include_directories(
-    ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${QWT_INCLUDE_DIRS}
+    ${QT_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${PYTHON_INCLUDE_DIRS}
 )
 
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${QWT_INCLUDE_DIRS})
-link_directories(${QWT_LIBRARY_DIRS})
+link_directories(
+	${QWT_LIBRARY_DIRS}
+	${Boost_LIBRARY_DIRS}
+)
 
-include_directories(${PYTHON_INCLUDE_DIRS})
 include_directories(${PYTHON_INCLUDE_PATH}) #deprecated for dirs (cmake 2.6)
 
 ########################################################################
@@ -80,8 +83,8 @@ include_directories(${PYTHON_INCLUDE_PATH}) #deprecated for dirs (cmake 2.6)
 ########################################################################
 list(APPEND qtgui_libs
     gnuradio-core
-    ${QT_LIBRARIES}
     ${QWT_LIBRARIES}
+    ${QT_LIBRARIES}
     ${PYTHON_LIBRARIES}
 )
 
-- 
cgit