From accb9f2fe8fd8f6a1e114adac5b15304b0e0012d Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 20 Jul 2011 19:04:32 -0700
Subject: gr: squashed cmakelists.txt into one commit

---
 gr-qtgui/swig/CMakeLists.txt | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 gr-qtgui/swig/CMakeLists.txt

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
new file mode 100644
index 000000000..047229944
--- /dev/null
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Copyright 2010-2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Setup swig generation
+########################################################################
+INCLUDE(GrPython)
+INCLUDE(GrSwig)
+
+SET(GR_SWIG_INCLUDE_DIRS
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GR_QTGUI_INCLUDE_DIRS}
+    ${QWT_INCLUDE_DIRS}
+)
+
+SET(GR_SWIG_LIBRARIES gnuradio-qtgui)
+
+GR_SWIG_MAKE(qtgui_swig qtgui_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS qtgui_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui
+    COMPONENT "qtgui_python"
+)
+
+INSTALL(FILES
+    qtgui_sink_c.i
+    qtgui_sink_f.i
+    qtgui_time_sink_c.i
+    qtgui_time_sink_f.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "qtgui_swig"
+)
-- 
cgit 


From 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 8 Oct 2011 17:11:12 -0700
Subject: gr: the CMakeLists.txt took a chill pill

---
 gr-qtgui/swig/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 047229944..234af5a68 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -20,16 +20,16 @@
 ########################################################################
 # Setup swig generation
 ########################################################################
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+include(GrPython)
+include(GrSwig)
 
-SET(GR_SWIG_INCLUDE_DIRS
+set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
 )
 
-SET(GR_SWIG_LIBRARIES gnuradio-qtgui)
+set(GR_SWIG_LIBRARIES gnuradio-qtgui)
 
 GR_SWIG_MAKE(qtgui_swig qtgui_swig.i)
 
@@ -39,7 +39,7 @@ GR_SWIG_INSTALL(
     COMPONENT "qtgui_python"
 )
 
-INSTALL(FILES
+install(FILES
     qtgui_sink_c.i
     qtgui_sink_f.i
     qtgui_time_sink_c.i
-- 
cgit 


From dd41a603b923092fb08595f88b036d0677e5e6d4 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Oct 2011 15:15:08 -0700
Subject: misc fix missing installed files/tweaks

---
 gr-qtgui/swig/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 234af5a68..34b40fb7e 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -40,6 +40,7 @@ GR_SWIG_INSTALL(
 )
 
 install(FILES
+    qtgui_swig.i
     qtgui_sink_c.i
     qtgui_sink_f.i
     qtgui_time_sink_c.i
-- 
cgit 


From e36b920bebc555f6ef0126a38c9ff4ce7a95bd79 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 27 Nov 2011 16:41:59 -0500
Subject: docs: added python doxygen docs to gr-qtgui

---
 gr-qtgui/swig/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 34b40fb7e..43c59033c 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -29,6 +29,9 @@ set(GR_SWIG_INCLUDE_DIRS
     ${QWT_INCLUDE_DIRS}
 )
 
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${GR_QTGUI_INCLUDE_DIRS})
+
 set(GR_SWIG_LIBRARIES gnuradio-qtgui)
 
 GR_SWIG_MAKE(qtgui_swig qtgui_swig.i)
-- 
cgit 


From 70ca9beab2c6c22eb9b98818fe1b69def41eb0db Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 27 Nov 2011 19:05:47 -0500
Subject: docs: forgot to have the generated .i files installed.

---
 gr-qtgui/swig/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 43c59033c..ba6c7ea08 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -48,6 +48,7 @@ install(FILES
     qtgui_sink_f.i
     qtgui_time_sink_c.i
     qtgui_time_sink_f.i
+    ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "qtgui_swig"
 )
-- 
cgit 


From a2de55ca27d20ee6bb6c7114469c4ea0b599ae92 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Mon, 28 Nov 2011 15:44:12 -0500
Subject: docs: more appropriate variable to use when setting the
 include/headers directory.

---
 gr-qtgui/swig/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index ba6c7ea08..9b637488d 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${GR_QTGUI_INCLUDE_DIRS})
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../include)
 
 set(GR_SWIG_LIBRARIES gnuradio-qtgui)
 
-- 
cgit 


From 2d88dd48d9563a561b5c851555c2ff4714fa66e3 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 30 Nov 2011 14:45:19 -0500
Subject: docs: fixing variable for location of header files (SOURCE not
 BINARY).

---
 gr-qtgui/swig/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 9b637488d..7a976f917 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../include)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
 set(GR_SWIG_LIBRARIES gnuradio-qtgui)
 
-- 
cgit 


From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 13 Apr 2012 18:36:53 -0400
Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool
 to do this in the future.

The sed script was provided by Moritz Fischer.
---
 gr-qtgui/swig/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 7a976f917..9f092f6c6 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2010-2011 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
-- 
cgit 


From 06c325cb925555d1864d67db20490eb67402868d Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Tue, 3 Jul 2012 14:22:41 -0700
Subject: swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds

I have not encountered an issue, however this is the correct thing to do.
Now individual components swig builds depend on the gr core swig target.

Conflicts:

	gr-filter/swig/CMakeLists.txt
---
 gr-qtgui/swig/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 9f092f6c6..e84035b9f 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
-- 
cgit 


From b928f8bd0971429cc6ba8b4a09629b2b55f77947 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 12 Dec 2012 11:02:30 -0500
Subject: build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have
 been the cause of the parallel build woes.

---
 gr-qtgui/swig/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index e84035b9f..9f092f6c6 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -23,8 +23,6 @@
 include(GrPython)
 include(GrSwig)
 
-set(GR_SWIG_TARGET_DEPS core_swig)
-
 set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
-- 
cgit 


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/swig/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gr-qtgui/swig/CMakeLists.txt')

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 9f092f6c6..a1f70240c 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -24,9 +24,12 @@ include(GrPython)
 include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
+    ${QT_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i)
-- 
cgit