diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-01 16:00:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-01 16:08:13 -0700 |
| commit | f8581fb475267e1a97eaab962e423559fb4bfce2 (patch) | |
| tree | 4b039de2d4cdc837f4e8a6b194a9c2c1463054c5 /gnuradio-core/CMakeLists.txt | |
| parent | 73800434abfb8c6efcf069222b5f0fea9c86870b (diff) | |
| parent | 045d02d1a69c916e60d87b655adfacfceeceeaaf (diff) | |
Merge remote branch 'jblum-github/python_blocks2' into master
Conflicts:
gnuradio-core/CMakeLists.txt
gnuradio-core/src/lib/general/general.i
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} ) |