From 7f622fef32225552811ccffa6b55fa6b2ad08f23 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 23 Jul 2011 23:17:06 -0700
Subject: comedi: cmake build support for gr-comedi component (linux only)

---
 gr-comedi/src/CMakeLists.txt | 107 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 gr-comedi/src/CMakeLists.txt

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
new file mode 100644
index 000000000..f9dfb169d
--- /dev/null
+++ b/gr-comedi/src/CMakeLists.txt
@@ -0,0 +1,107 @@
+# Copyright 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 the include and linker paths
+########################################################################
+INCLUDE_DIRECTORIES(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_COMEDI_INCLUDE_DIRS}
+)
+
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(${COMEDI_INCLUDE_DIRS})
+LINK_DIRECTORIES(${COMEDI_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+LIST(APPEND gr_comedi_sources
+    ${comedii_viterbi_mux_cc}
+    comedi_sink_s.cc
+    comedi_source_s.cc
+    gri_comedi.cc
+)
+
+LIST(APPEND comedi_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${COMEDI_LIBRARIES}
+)
+
+ADD_LIBRARY(gnuradio-comedi SHARED ${gr_comedi_sources})
+TARGET_LINK_LIBRARIES(gnuradio-comedi ${comedi_libs})
+SET_TARGET_PROPERTIES(gnuradio-comedi PROPERTIES DEFINE_SYMBOL "gnuradio_comedi_EXPORTS")
+SET_TARGET_PROPERTIES(gnuradio-comedi PROPERTIES SOVERSION ${LIBVER})
+
+INSTALL(TARGETS gnuradio-comedi
+    LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_runtime" # .so/.dylib file
+    ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_devel" # .lib file
+    RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "comedi_runtime" # .dll file
+)
+
+########################################################################
+# Setup swig generation
+########################################################################
+IF(ENABLE_PYTHON)
+INCLUDE(GrPython)
+INCLUDE(GrSwig)
+
+SET(GR_SWIG_INCLUDE_DIRS
+    ${GR_COMEDI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+SET(GR_SWIG_LIBRARIES gnuradio-comedi)
+
+GR_SWIG_MAKE(comedi comedi.i)
+
+GR_SWIG_INSTALL(
+    TARGETS comedi
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "comedi_python"
+)
+
+INSTALL(
+    FILES comedi.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "comedi_swig"
+)
+
+ENDIF(ENABLE_PYTHON)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+IF(ENABLE_TESTING AND ENABLE_PYTHON)
+INCLUDE(GrTest)
+FILE(GLOB py_qa_test_files "qa_*.py")
+FOREACH(py_qa_test_file ${py_qa_test_files})
+    GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    SET(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-comedi/src
+    )
+    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ENDFOREACH(py_qa_test_file)
+ENDIF(ENABLE_TESTING AND ENABLE_PYTHON)
-- 
cgit 


From 2ac512b0d209600834425141f18d111524ad1348 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 23 Jul 2011 23:35:44 -0700
Subject: video-sdl: cmake build support for gr-video-sdl component (unix only)

---
 gr-comedi/src/CMakeLists.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index f9dfb169d..af1fc372c 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -35,7 +35,6 @@ LINK_DIRECTORIES(${COMEDI_LIBRARY_DIRS})
 # Setup library
 ########################################################################
 LIST(APPEND gr_comedi_sources
-    ${comedii_viterbi_mux_cc}
     comedi_sink_s.cc
     comedi_source_s.cc
     gri_comedi.cc
@@ -58,6 +57,16 @@ INSTALL(TARGETS gnuradio-comedi
     RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "comedi_runtime" # .dll file
 )
 
+########################################################################
+# Install public header files
+########################################################################
+INSTALL(FILES
+    comedi_sink_s.h
+    comedi_source_s.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "comedi_devel"
+)
+
 ########################################################################
 # Setup swig generation
 ########################################################################
-- 
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-comedi/src/CMakeLists.txt | 58 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index af1fc372c..e963f9586 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -20,38 +20,38 @@
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-INCLUDE_DIRECTORIES(
+include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_COMEDI_INCLUDE_DIRS}
 )
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
-INCLUDE_DIRECTORIES(${COMEDI_INCLUDE_DIRS})
-LINK_DIRECTORIES(${COMEDI_LIBRARY_DIRS})
+include_directories(${COMEDI_INCLUDE_DIRS})
+link_directories(${COMEDI_LIBRARY_DIRS})
 
 ########################################################################
 # Setup library
 ########################################################################
-LIST(APPEND gr_comedi_sources
+list(APPEND gr_comedi_sources
     comedi_sink_s.cc
     comedi_source_s.cc
     gri_comedi.cc
 )
 
-LIST(APPEND comedi_libs
+list(APPEND comedi_libs
     gnuradio-core
     ${Boost_LIBRARIES}
     ${COMEDI_LIBRARIES}
 )
 
-ADD_LIBRARY(gnuradio-comedi SHARED ${gr_comedi_sources})
-TARGET_LINK_LIBRARIES(gnuradio-comedi ${comedi_libs})
-SET_TARGET_PROPERTIES(gnuradio-comedi PROPERTIES DEFINE_SYMBOL "gnuradio_comedi_EXPORTS")
-SET_TARGET_PROPERTIES(gnuradio-comedi PROPERTIES SOVERSION ${LIBVER})
+add_library(gnuradio-comedi SHARED ${gr_comedi_sources})
+target_link_libraries(gnuradio-comedi ${comedi_libs})
+set_target_properties(gnuradio-comedi PROPERTIES DEFINE_SYMBOL "gnuradio_comedi_EXPORTS")
+set_target_properties(gnuradio-comedi PROPERTIES SOVERSION ${LIBVER})
 
-INSTALL(TARGETS gnuradio-comedi
+install(TARGETS gnuradio-comedi
     LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_runtime" # .so/.dylib file
     ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_devel" # .lib file
     RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "comedi_runtime" # .dll file
@@ -60,7 +60,7 @@ INSTALL(TARGETS gnuradio-comedi
 ########################################################################
 # Install public header files
 ########################################################################
-INSTALL(FILES
+install(FILES
     comedi_sink_s.h
     comedi_source_s.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
@@ -70,16 +70,16 @@ INSTALL(FILES
 ########################################################################
 # Setup swig generation
 ########################################################################
-IF(ENABLE_PYTHON)
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+if(ENABLE_PYTHON)
+include(GrPython)
+include(GrSwig)
 
-SET(GR_SWIG_INCLUDE_DIRS
+set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
 
-SET(GR_SWIG_LIBRARIES gnuradio-comedi)
+set(GR_SWIG_LIBRARIES gnuradio-comedi)
 
 GR_SWIG_MAKE(comedi comedi.i)
 
@@ -89,28 +89,28 @@ GR_SWIG_INSTALL(
     COMPONENT "comedi_python"
 )
 
-INSTALL(
+install(
     FILES comedi.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "comedi_swig"
 )
 
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Handle the unit tests
 ########################################################################
-IF(ENABLE_TESTING AND ENABLE_PYTHON)
-INCLUDE(GrTest)
-FILE(GLOB py_qa_test_files "qa_*.py")
-FOREACH(py_qa_test_file ${py_qa_test_files})
-    GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
-    SET(GR_TEST_PYTHON_DIRS
+if(ENABLE_TESTING AND ENABLE_PYTHON)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-comedi/src
     )
-    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
-ENDFOREACH(py_qa_test_file)
-ENDIF(ENABLE_TESTING AND ENABLE_PYTHON)
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING AND ENABLE_PYTHON)
-- 
cgit 


From faf7dea043728056bed5a7eb0529162eb7d9f932 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 23 Oct 2011 15:43:03 -0700
Subject: the libraries

---
 gr-comedi/src/CMakeLists.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index e963f9586..2573940dc 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -48,14 +48,7 @@ list(APPEND comedi_libs
 
 add_library(gnuradio-comedi SHARED ${gr_comedi_sources})
 target_link_libraries(gnuradio-comedi ${comedi_libs})
-set_target_properties(gnuradio-comedi PROPERTIES DEFINE_SYMBOL "gnuradio_comedi_EXPORTS")
-set_target_properties(gnuradio-comedi PROPERTIES SOVERSION ${LIBVER})
-
-install(TARGETS gnuradio-comedi
-    LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_runtime" # .so/.dylib file
-    ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "comedi_devel" # .lib file
-    RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "comedi_runtime" # .dll file
-)
+GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel")
 
 ########################################################################
 # Install public header files
-- 
cgit 


From 6c50cfa96ee15892c67e56585ded57b0fe405f59 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 27 Nov 2011 16:41:29 -0500
Subject: docs: added python doxygen docs to gr-comedi

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

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 2573940dc..bbf0c9bb2 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -72,6 +72,9 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
 
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${GR_COMEDI_INCLUDE_DIRS})
+
 set(GR_SWIG_LIBRARIES gnuradio-comedi)
 
 GR_SWIG_MAKE(comedi comedi.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-comedi/src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index bbf0c9bb2..bf6ff89c4 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -87,6 +87,7 @@ GR_SWIG_INSTALL(
 
 install(
     FILES comedi.i
+    ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "comedi_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-comedi/src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index bf6ff89c4..490a24e4b 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set(GR_SWIG_INCLUDE_DIRS
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${GR_COMEDI_INCLUDE_DIRS})
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 
 set(GR_SWIG_LIBRARIES gnuradio-comedi)
 
-- 
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-comedi/src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 490a24e4b..6ad14737b 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set(GR_SWIG_INCLUDE_DIRS
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_BINARY_DIR})
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(GR_SWIG_LIBRARIES gnuradio-comedi)
 
-- 
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-comedi/src/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 6ad14737b..1d3d16908 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 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-comedi/src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 1d3d16908..5291e4d90 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -67,6 +67,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-- 
cgit 


From 32cad29dc50d26af8e7a34b040d9d2657017e5bb Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 3 Nov 2012 14:02:49 -0700
Subject: gr: added python -B everywhere for clean source tree

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

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 5291e4d90..8c4834115 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -110,6 +110,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-comedi/src
     )
     set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
-    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING AND ENABLE_PYTHON)
-- 
cgit 


From 37f752257d7fc336de1fe85a5a83134e66441e6e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:04:16 -0800
Subject: gr: set a common GR_TEST_TARGET_DEPS for all module unit tests

Each unit test shares common dependencies,
but we have been neglecting to set these.

In this changeset, we set one top level GR_TEST_TARGET_DEPS,
and simply append module-specific dependencies for each test.

This also helps to fix QA tests on windows
which were missing the dependencies list.

Conflicts:

	gr-analog/python/CMakeLists.txt
	gr-blocks/python/CMakeLists.txt
---
 gr-comedi/src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 8c4834115..0ef429a7d 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -109,7 +109,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-comedi/src
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING AND ENABLE_PYTHON)
-- 
cgit 


From c4c0ce97f4f5586548a603acc8c9721f416c5803 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:31:45 -0800
Subject: gr: same change for common PYTHON test paths

Conflicts:

	gr-analog/python/CMakeLists.txt
	gr-blocks/python/CMakeLists.txt
---
 gr-comedi/src/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 0ef429a7d..91bbf9212 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -100,16 +100,16 @@ endif(ENABLE_PYTHON)
 # Handle the unit tests
 ########################################################################
 if(ENABLE_TESTING AND ENABLE_PYTHON)
+
+list(APPEND GR_TEST_PYTHON_DIRS
+    ${CMAKE_BINARY_DIR}/gr-comedi/src
+)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi)
+
 include(GrTest)
 file(GLOB py_qa_test_files "qa_*.py")
 foreach(py_qa_test_file ${py_qa_test_files})
     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-    set(GR_TEST_PYTHON_DIRS
-        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
-        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
-        ${CMAKE_BINARY_DIR}/gr-comedi/src
-    )
-    list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING AND ENABLE_PYTHON)
-- 
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-comedi/src/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 91bbf9212..957eacaf2 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -67,8 +67,6 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
-set(GR_SWIG_TARGET_DEPS core_swig)
-
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_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-comedi/src/CMakeLists.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'gr-comedi/src/CMakeLists.txt')

diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 957eacaf2..1d9dac2c4 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -21,15 +21,17 @@
 # Setup the include and linker paths
 ########################################################################
 include_directories(
-    ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_COMEDI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${COMEDI_INCLUDE_DIRS}
 )
 
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${COMEDI_INCLUDE_DIRS})
-link_directories(${COMEDI_LIBRARY_DIRS})
+link_directories(
+	${Boost_LIBRARY_DIRS}
+	${COMEDI_LIBRARY_DIRS}
+)
 
 ########################################################################
 # Setup library
@@ -70,6 +72,8 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
-- 
cgit