diff options
| author | Ben Reynwar <ben@reynwar.net> | 2012-08-08 14:26:07 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2012-08-08 14:26:07 -0700 |
| commit | 9be7c30d6df3fb8bd75db0659fa7a7d163d65657 (patch) | |
| tree | eaca0dec00f1aad0c8b883944f40e7c9730644f3 /gr-fft/lib/CMakeLists.txt | |
| parent | c27d9d3bac3a870fee9ec8c4289ae65ab4f2decc (diff) | |
| parent | 9305abf4be93205cf240e99ce7136702f724c490 (diff) | |
Merge branch 'master' into comments
Diffstat (limited to 'gr-fft/lib/CMakeLists.txt')
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index e2f17a1830..ea1248fbac 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -21,19 +21,16 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GR_FFT_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_FFT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${FFTW3F_INCLUDE_DIRS} ) -include_directories(${FFT_INCLUDE_DIRS}) link_directories(${FFT_LIBRARY_DIRS}) - -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) - -include_directories(${FFTW3F_INCLUDE_DIRS}) link_directories(${FFTW3F_LIBRARY_DIRS}) ######################################################################## |