diff options
| author | Michael L Dickens | 2013-01-01 21:42:23 -0500 |
|---|---|---|
| committer | Michael L Dickens | 2013-01-01 21:42:23 -0500 |
| commit | e788c523d4f8de3efd64a64f148ac1bf25ea032d (patch) | |
| tree | c6c243c3770f65a71cb9f3990dd2dd8c27bdb422 /gr-filter | |
| parent | 053d729bcaa6e88791ae21f4c29f3df631aaab65 (diff) | |
| download | gnuradio-e788c523d4f8de3efd64a64f148ac1bf25ea032d.tar.gz gnuradio-e788c523d4f8de3efd64a64f148ac1bf25ea032d.tar.bz2 gnuradio-e788c523d4f8de3efd64a64f148ac1bf25ea032d.zip | |
Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | gr-filter/swig/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 81f62aa54..626f5521f 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -90,12 +90,13 @@ expand_cc(rational_resampler_base_XXX_impl ccc ccf fcc fff fsf scc) # Setup the include and linker paths ######################################################################## include_directories( - ${GR_FILTER_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${VOLK_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${VOLK_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt index 3eee3a1ee..b3078b11b 100644 --- a/gr-filter/swig/CMakeLists.txt +++ b/gr-filter/swig/CMakeLists.txt @@ -26,6 +26,8 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_FILTER_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${FFT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ) |