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

---
 gnuradio-core/CMakeLists.txt | 159 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 gnuradio-core/CMakeLists.txt

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
new file mode 100644
index 000000000..102e64274
--- /dev/null
+++ b/gnuradio-core/CMakeLists.txt
@@ -0,0 +1,159 @@
+# 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 dependencies
+########################################################################
+INCLUDE(GrBoost)
+
+FIND_PACKAGE(GSL)
+
+FIND_PACKAGE(FFTW3f)
+
+INCLUDE(GrPython) #used for code generation
+
+GET_FILENAME_COMPONENT(GR_CORE_PYTHONPATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/python ABSOLUTE
+)
+GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
+
+########################################################################
+# Register component
+########################################################################
+INCLUDE(GrComponent)
+GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
+    ENABLE_GRUEL_
+    Boost_FOUND
+    GSL_FOUND
+    FFTW3F_FOUND
+    PYTHONINTERP_FOUND
+)
+
+INCLUDE(GrMiscUtils)
+GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
+    ${GRUEL_INCLUDE_DIRS} #headers depend on gruel
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/gengen
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/gengen
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/filter
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/filter
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/missing
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/reed-solomon
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/viterbi
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/io
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/g72x
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
+)
+
+GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+IF(ENABLE_GR_CORE)
+
+########################################################################
+# Setup CPack components
+########################################################################
+INCLUDE(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "The GNU Radio Core Library")
+
+CPACK_COMPONENT("core_runtime"
+    GROUP        "Core"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "gruel_runtime"
+)
+
+CPACK_COMPONENT("core_devel"
+    GROUP        "Core"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "gruel_devel"
+)
+
+CPACK_COMPONENT("core_python"
+    GROUP        "Core"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "gruel_python;core_runtime"
+)
+
+CPACK_COMPONENT("core_swig"
+    GROUP        "Core"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "gruel_swig;core_python;core_devel"
+)
+
+INSTALL(
+    FILES gnuradio-core.conf
+    DESTINATION ${GR_PKG_CONF_DIR}
+    COMPONENT "core_runtime"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+ADD_SUBDIRECTORY(src/lib)
+IF(ENABLE_TESTING)
+    ADD_SUBDIRECTORY(src/tests)
+ENDIF(ENABLE_TESTING)
+IF(ENABLE_PYTHON)
+    ADD_SUBDIRECTORY(src/lib/swig)
+    ADD_SUBDIRECTORY(src/python/gnuradio)
+ENDIF(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+FILE(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}/gnuradio" includedir) #different from other gr modules
+FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_DATA_DIR}/guile/site" guile_load_path) #screw this...
+
+FOREACH(boost_include ${Boost_INCLUDE_DIRS})
+    SET(BOOST_CXXFLAGS "-I${boost_include} ${BOOST_CXXFLAGS}")
+ENDFOREACH(boost_include)
+
+FOREACH(boost_libdir ${Boost_LIBRARY_DIRS})
+    SET(BOOST_LDFLAGS "-L${boost_libdir} ${BOOST_LDFLAGS}")
+ENDFOREACH(boost_libdir)
+
+FOREACH(boost_ldflag ${Boost_LIBRARIES})
+    SET(BOOST_LDFLAGS "${boost_ldflag} ${BOOST_LDFLAGS}")
+ENDFOREACH(boost_ldflag)
+
+CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+@ONLY)
+
+INSTALL(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "core_devel"
+)
+
+ENDIF(ENABLE_GR_CORE)
-- 
cgit 


From fbe4a14d8fb6d6696bd0ac8a4921ba1269601d78 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 2 Aug 2011 12:45:26 -0700
Subject: cmake: language tweak for component group description

---
 gnuradio-core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 102e64274..3782ae0ed 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -79,7 +79,7 @@ IF(ENABLE_GR_CORE)
 # Setup CPack components
 ########################################################################
 INCLUDE(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "The GNU Radio Core Library")
+CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library")
 
 CPACK_COMPONENT("core_runtime"
     GROUP        "Core"
-- 
cgit 


From 7125a92e1bf7483656af6ef8dcc0be7626a30a82 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 30 Jul 2011 10:31:02 -0700
Subject: core: dont set boost vars for gnuradio-core.pc

If this is useful, it should be in gruel.pc; but gruel.pc has no private libs or boost dirs.
Also, the substitution of absolute boost library paths is bad for cross builds (even native ones)
---
 gnuradio-core/CMakeLists.txt | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 3782ae0ed..1c133efb9 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -131,19 +131,6 @@ ENDIF(ENABLE_PYTHON)
 # Create Pkg Config File
 ########################################################################
 FILE(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}/gnuradio" includedir) #different from other gr modules
-FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_DATA_DIR}/guile/site" guile_load_path) #screw this...
-
-FOREACH(boost_include ${Boost_INCLUDE_DIRS})
-    SET(BOOST_CXXFLAGS "-I${boost_include} ${BOOST_CXXFLAGS}")
-ENDFOREACH(boost_include)
-
-FOREACH(boost_libdir ${Boost_LIBRARY_DIRS})
-    SET(BOOST_LDFLAGS "-L${boost_libdir} ${BOOST_LDFLAGS}")
-ENDFOREACH(boost_libdir)
-
-FOREACH(boost_ldflag ${Boost_LIBRARIES})
-    SET(BOOST_LDFLAGS "${boost_ldflag} ${BOOST_LDFLAGS}")
-ENDFOREACH(boost_ldflag)
 
 CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
-- 
cgit 


From 1c595293862954149f5815d77347bd9b5e62289c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 3 Aug 2011 16:50:52 -0700
Subject: core: removed modification of includedir for pc file, its not needed
 and was messing it up

---
 gnuradio-core/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 1c133efb9..b72bf70d6 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -130,8 +130,6 @@ ENDIF(ENABLE_PYTHON)
 ########################################################################
 # Create Pkg Config File
 ########################################################################
-FILE(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}/gnuradio" includedir) #different from other gr modules
-
 CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
-- 
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

---
 gnuradio-core/CMakeLists.txt | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 780770bb8..99bd482b8 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -20,15 +20,15 @@
 ########################################################################
 # Setup dependencies
 ########################################################################
-INCLUDE(GrBoost)
+include(GrBoost)
 
-FIND_PACKAGE(GSL)
+find_package(GSL)
 
-FIND_PACKAGE(FFTW3f)
+find_package(FFTW3f)
 
-INCLUDE(GrPython) #used for code generation
+include(GrPython) #used for code generation
 
-GET_FILENAME_COMPONENT(GR_CORE_PYTHONPATH
+get_filename_component(GR_CORE_PYTHONPATH
     ${CMAKE_CURRENT_SOURCE_DIR}/src/python ABSOLUTE
 )
 GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
@@ -36,7 +36,7 @@ GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
 ########################################################################
 # Register component
 ########################################################################
-INCLUDE(GrComponent)
+include(GrComponent)
 GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
     ENABLE_GRUEL_
     Boost_FOUND
@@ -45,7 +45,7 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
     PYTHONINTERP_FOUND
 )
 
-INCLUDE(GrMiscUtils)
+include(GrMiscUtils)
 GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
     ${GRUEL_INCLUDE_DIRS} #headers depend on gruel
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
@@ -73,12 +73,12 @@ GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
 ########################################################################
 # Begin conditional configuration
 ########################################################################
-IF(ENABLE_GR_CORE)
+if(ENABLE_GR_CORE)
 
 ########################################################################
 # Setup CPack components
 ########################################################################
-INCLUDE(GrPackage)
+include(GrPackage)
 CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library")
 
 CPACK_COMPONENT("core_runtime"
@@ -109,7 +109,7 @@ CPACK_COMPONENT("core_swig"
     DEPENDS      "gruel_swig;core_python;core_devel"
 )
 
-INSTALL(
+install(
     FILES gnuradio-core.conf
     DESTINATION ${GR_PKG_CONF_DIR}
     COMPONENT "core_runtime"
@@ -118,27 +118,27 @@ INSTALL(
 ########################################################################
 # Add subdirectories
 ########################################################################
-ADD_SUBDIRECTORY(src/lib)
-IF(ENABLE_TESTING)
-    ADD_SUBDIRECTORY(src/tests)
-ENDIF(ENABLE_TESTING)
-IF(ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(src/lib/swig)
-    ADD_SUBDIRECTORY(src/python/gnuradio)
-ENDIF(ENABLE_PYTHON)
+add_subdirectory(src/lib)
+if(ENABLE_TESTING)
+    add_subdirectory(src/tests)
+endif(ENABLE_TESTING)
+if(ENABLE_PYTHON)
+    add_subdirectory(src/lib/swig)
+    add_subdirectory(src/python/gnuradio)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Create Pkg Config File
 ########################################################################
-CONFIGURE_FILE(
+configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
 @ONLY)
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
     COMPONENT "core_devel"
 )
 
-ENDIF(ENABLE_GR_CORE)
+endif(ENABLE_GR_CORE)
-- 
cgit 


From cba101dc802b4d4fa8db42ff40d25995d50f2491 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 19 Oct 2011 13:21:51 -0700
Subject: core: forgot to remove extra under

---
 gnuradio-core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 99bd482b8..029ff28a4 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -38,7 +38,7 @@ GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
 ########################################################################
 include(GrComponent)
 GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
-    ENABLE_GRUEL_
+    ENABLE_GRUEL
     Boost_FOUND
     GSL_FOUND
     FFTW3F_FOUND
-- 
cgit 


From 9789365e056ccf1373a59f0e63f6f94f83f5073f Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Oct 2011 22:38:57 -0700
Subject: tags: added swigging for gr_tags header

---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 029ff28a4..360a5c090 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -66,6 +66,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 )
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}/gruel/src/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${GNURADIO_CORE_INCLUDE_DIRS}
 )
-- 
cgit 


From 469cb5fd92ca7d1899e64b011d371f04e8830911 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 23 Oct 2011 17:52:13 -0400
Subject: core: Making gnuradio-core dependent on Volk. This means you HAVE to
 have Volk build in order to build GNU Radio. Volk is now a 'first-class
 citizen.'

---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 360a5c090..1d609a283 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -39,6 +39,7 @@ GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
 include(GrComponent)
 GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
     ENABLE_GRUEL
+    ENABLE_VOLK
     Boost_FOUND
     GSL_FOUND
     FFTW3F_FOUND
-- 
cgit 


From 11d58fe2e58c83fffae0153b3d541e9928f04411 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 16 Nov 2011 23:40:13 -0800
Subject: work on swig docs, added to core and digital

---
 gnuradio-core/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 1d609a283..101f4c3a3 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -60,7 +60,6 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/reed-solomon
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/viterbi
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/io
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/g72x
     ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
-- 
cgit 


From f9b73b1710f19529b99f8f69c8e3a06839ad68bc Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 1 Apr 2012 13:23:06 -0700
Subject: wavelet: move wavelet blocks to new top-level component

---
 gnuradio-core/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 101f4c3a3..699104499 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -22,8 +22,6 @@
 ########################################################################
 include(GrBoost)
 
-find_package(GSL)
-
 find_package(FFTW3f)
 
 include(GrPython) #used for code generation
@@ -41,7 +39,6 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
     ENABLE_GRUEL
     ENABLE_VOLK
     Boost_FOUND
-    GSL_FOUND
     FFTW3F_FOUND
     PYTHONINTERP_FOUND
 )
-- 
cgit 


From faab807cf5e8b4a4c950d1fd8ae6672296fb1ad9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Tue, 3 Apr 2012 18:21:52 -0400
Subject: Rework example directories. Gets rid of gnuradio-examples, moves
 these to more appropriate components.

gnuradio-core and grc now have their own examples directories for files directly related to them.
---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 101f4c3a3..c05c6404f 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -126,6 +126,7 @@ endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
     add_subdirectory(src/lib/swig)
     add_subdirectory(src/python/gnuradio)
+    add_subdirectory(src/examples)
 endif(ENABLE_PYTHON)
 
 ########################################################################
-- 
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.
---
 gnuradio-core/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 13965f3db..022710844 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/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 30ea41c48215af4c50049aefb4ff0e59f14decfe Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 17 Apr 2012 22:14:05 -0700
Subject: this is squashed python blocks support

---
 gnuradio-core/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 022710844..767f82868 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -64,6 +64,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/swig
+    ${CMAKE_BINARY_DIR}/gruel/src/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${GNURADIO_CORE_INCLUDE_DIRS}
 )
-- 
cgit 


From 403103de15cc60e73d38b56cbc16004123eeeda1 Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Tue, 12 Jun 2012 17:36:34 -0400
Subject: new block, gr_annotator_raw  allows passing a raw pmt k->v pair from
 outside the flowgraph/python  in at exact samples

also added GRUEL autogenerated .i files to gnuradio-core-swig include line
---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 022710844..4947c410b 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -64,6 +64,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/swig
+    ${CMAKE_BINARY_DIR}/gruel/src/swig/
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${GNURADIO_CORE_INCLUDE_DIRS}
 )
-- 
cgit 


From 9b2855a4d868731a2d4a1eb03b12d5c930c5c6d0 Mon Sep 17 00:00:00 2001
From: Chí-Thanh Christopher Nguyễn
Date: Sat, 16 Jun 2012 17:34:19 -0400
Subject: cmake: add support for SYSCONFDIR

Set with 'cmake -DSYSCONFDIR=target ...'

This fixes http://gnuradio.org/redmine/issues/492
---
 gnuradio-core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 4947c410b..4e76b3c5a 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -110,7 +110,7 @@ CPACK_COMPONENT("core_swig"
 
 install(
     FILES gnuradio-core.conf
-    DESTINATION ${GR_PKG_CONF_DIR}
+    DESTINATION ${GR_PREFSDIR}
     COMPONENT "core_runtime"
 )
 
-- 
cgit 


From 3a142bebafdc018bccc80cf124a375b53db03581 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sat, 7 Jul 2012 08:34:38 -0700
Subject: Revert "Merge remote branch 'jblum-github/python_blocks2' into
 master"

This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing
changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b.
---
 gnuradio-core/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 5f26216d3..4e76b3c5a 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -64,7 +64,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/swig
-    ${CMAKE_BINARY_DIR}/gruel/src/swig
+    ${CMAKE_BINARY_DIR}/gruel/src/swig/
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${GNURADIO_CORE_INCLUDE_DIRS}
 )
-- 
cgit 


From 61b99449eeaaebe5ccc10758549add9c9e23f710 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Tue, 27 Nov 2012 17:18:28 -0800
Subject: Revert "Revert "Merge remote branch 'jblum-github/python_blocks2'
 into master""

This reverts commit 3a142bebafdc018bccc80cf124a375b53db03581.

Since updating __init__.py for ticket 181, we should have fixed the same bug that was being seen here.

Conflicts:

	gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
---
 gnuradio-core/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 4e76b3c5a..5f26216d3 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -64,7 +64,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/swig
-    ${CMAKE_BINARY_DIR}/gruel/src/swig/
+    ${CMAKE_BINARY_DIR}/gruel/src/swig
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${GNURADIO_CORE_INCLUDE_DIRS}
 )
-- 
cgit 


From d6bcc93a6965b9f2fd226a5bb05b051e95cd625d Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 28 Nov 2012 20:06:49 -0800
Subject: build: set Boost_INCLUDE_DIRS for components (mostly for OSX and
 Windows).

---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 5f26216d3..44f099e07 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -45,6 +45,7 @@ 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
-- 
cgit 


From e26d2cf197aeb077f321c73e7a057a58d7117f38 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 3 Dec 2012 14:58:14 -0800
Subject: core: moving Boost_INCLUDE_DIRS to be last

---
 gnuradio-core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 4e76b3c5a..d773280e6 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -60,6 +60,7 @@ 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
-- 
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).

---
 gnuradio-core/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

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
-- 
cgit 


From baaf2b6cf06f464a710c3f36db4c9275dd915d92 Mon Sep 17 00:00:00 2001
From: Michael L Dickens
Date: Thu, 3 Jan 2013 10:30:33 -0500
Subject: Reorder SWIG_INCLUDE_DIRS

---
 gnuradio-core/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 0a4ea3c30..b27710354 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -62,10 +62,10 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
 )
 
 GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
     ${CMAKE_SOURCE_DIR}/gruel/src/swig
     ${CMAKE_BINARY_DIR}/gruel/src/swig
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
-    ${GNURADIO_CORE_INCLUDE_DIRS}
 )
 
 ########################################################################
-- 
cgit 


From e826097e09fdfb04d14bf87861646b88229db881 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Jan 2013 13:51:46 -0800
Subject: gras: support changeset for 3.6.4

used volk from next branch cf5c930d89ac89ba5a0da4a616c88d3c37e018ae for grextras support (it uses the dispatcher)

empty stubs for the gr_basic_block msg passing. This is going to be difficult to figure out. The alias stuff may or may not be related

most qa pass, there seems to be some additional issues, will be working through them on futher commits

Conflicts:

	gnuradio-core/CMakeLists.txt
	gnuradio-core/src/lib/runtime/CMakeLists.txt
	gnuradio-core/src/lib/runtime/gr_block.cc
	gnuradio-core/src/lib/runtime/gr_block.h
	gnuradio-core/src/lib/runtime/gr_hier_block2.h
	gnuradio-core/src/lib/runtime/gr_top_block.h
	gnuradio-core/src/python/gnuradio/gr/__init__.py
	gr-audio/examples/c++/CMakeLists.txt
	gr-fcd/examples/c++/CMakeLists.txt
	grc/python/Port.py
---
 gnuradio-core/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnuradio-core/CMakeLists.txt')

diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index b27710354..dfbf28bd8 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -45,6 +45,8 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
 
 include(GrMiscUtils)
 GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
+    ${GRAS_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
-- 
cgit