diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-03-15 02:12:20 -0700 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-16 23:52:19 -0400 |
| commit | 7fd15b67afa5abd20c0982bdd6bcb7191831bf73 (patch) | |
| tree | 3bd525f2850e662a9ccfe0a6c286ff7c20ad57e3 /gr-blocks/CMakeLists.txt | |
| parent | 34216336205ba3edc0bc308a8da9ad388f3d0774 (diff) | |
Squash/rebased martin/ofdm-master onto trial merge branch
Conflicts:
gr-blocks/include/blocks/CMakeLists.txt
Diffstat (limited to 'gr-blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index e92e4c2808..c4821da2b8 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -34,6 +34,8 @@ GR_REGISTER_COMPONENT("gr-blocks" ENABLE_GR_BLOCKS GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR}/lib + ${CMAKE_CURRENT_BINARY_DIR}/include ) ######################################################################## |