diff options
| author | Johnathan Corgan | 2012-07-03 17:58:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-07-03 17:58:46 -0700 |
| commit | b271b9d2ef0290b866f0afb22ba53c394c422418 (patch) | |
| tree | 177d5c81ea5cd6f8e5873df87a3d434060e9a61f /gnuradio-core/CMakeLists.txt | |
| parent | 84f9822b4a8fe4290e971c09b2bd99f1bf59517b (diff) | |
| parent | dbc7a4c08ac27844e413a39a326bf1b50b09dd00 (diff) | |
| download | gnuradio-b271b9d2ef0290b866f0afb22ba53c394c422418.tar.gz gnuradio-b271b9d2ef0290b866f0afb22ba53c394c422418.tar.bz2 gnuradio-b271b9d2ef0290b866f0afb22ba53c394c422418.zip | |
Merge branch 'master' into wip/gr-blocks-master
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 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} ) |