diff options
author | Johnathan Corgan | 2012-04-09 14:10:26 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-04-09 14:10:26 -0700 |
commit | 779d8c67ae520ab76198019e656c86c88281719d (patch) | |
tree | 0290980e749658af67008ec5a3ef6034c0124ea1 | |
parent | 3de14a2aee748c80a5f1e61e3ca6809fc2e914bc (diff) | |
parent | c7139a7eca69b3245c615ca9ac830ac04eff777c (diff) | |
download | gnuradio-779d8c67ae520ab76198019e656c86c88281719d.tar.gz gnuradio-779d8c67ae520ab76198019e656c86c88281719d.tar.bz2 gnuradio-779d8c67ae520ab76198019e656c86c88281719d.zip |
Merge branch 'maint'
-rw-r--r-- | gnuradio-core/src/lib/gengen/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt index 8a43a8880..d13776990 100644 --- a/gnuradio-core/src/lib/gengen/CMakeLists.txt +++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt @@ -20,6 +20,7 @@ ######################################################################## # This file included, use CMake directory variables ######################################################################## +include(GrPython) ######################################################################## # generate the python helper script which calls into the build utils diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index 60e86b87c..9080afa56 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -17,6 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. +include(GrPython) + ######################################################################## # Setup the include and linker paths ######################################################################## |