diff options
author | Johnathan Corgan | 2012-07-07 08:34:38 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-07-07 08:34:38 -0700 |
commit | 3a142bebafdc018bccc80cf124a375b53db03581 (patch) | |
tree | 89329a63e26aa439bf0d8648a586e955780db731 /gnuradio-core/CMakeLists.txt | |
parent | dbc7a4c08ac27844e413a39a326bf1b50b09dd00 (diff) | |
download | gnuradio-3a142bebafdc018bccc80cf124a375b53db03581.tar.gz gnuradio-3a142bebafdc018bccc80cf124a375b53db03581.tar.bz2 gnuradio-3a142bebafdc018bccc80cf124a375b53db03581.zip |
Revert "Merge remote branch 'jblum-github/python_blocks2' into master"
This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing
changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b.
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 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} ) |