diff options
| author | Tom Rondeau | 2012-05-02 11:45:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-05-02 11:45:29 -0400 |
| commit | 7f8331808f99a9747bed39e55bbee98bc58c6038 (patch) | |
| tree | 63ce6ac63d016cf5acb343a64d5174c1c859eb3b /gr-filter/lib | |
| parent | f64b971f34ab813f70b0680ec7ae02744343ef3c (diff) | |
| download | gnuradio-7f8331808f99a9747bed39e55bbee98bc58c6038.tar.gz gnuradio-7f8331808f99a9747bed39e55bbee98bc58c6038.tar.bz2 gnuradio-7f8331808f99a9747bed39e55bbee98bc58c6038.zip | |
build: reworking cmake structure for include and lib directories. I think this is cleaner.
We also probably don't need the link_directories (according to the cmake guys, this is no longer necessary).
Diffstat (limited to 'gr-filter/lib')
| -rw-r--r-- | gr-filter/lib/CMakeLists.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 0ffdb75fc..2850b6925 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -21,22 +21,18 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} - ${VOLK_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${VOLK_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_FFT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${FFTW3F_INCLUDE_DIRS} ) -include_directories(${FILTER_INCLUDE_DIRS}) -link_directories(${FILTER_LIBRARY_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}) ######################################################################## |