diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-27 17:18:28 -0800 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-27 17:43:03 -0800 |
| commit | 61b99449eeaaebe5ccc10758549add9c9e23f710 (patch) | |
| tree | 35aa63e791aff724dfec3d016566f16f72e7821a /gnuradio-core/CMakeLists.txt | |
| parent | c941e8f5f22c3911ba36b72478794ff47ee679a7 (diff) | |
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
Diffstat (limited to 'gnuradio-core/CMakeLists.txt')
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 4e76b3c5a6..5f26216d35 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} ) |