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-shd | |
| 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-shd')
| -rw-r--r-- | gr-shd/lib/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | gr-shd/swig/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt index 9ddf109af..38154755c 100644 --- a/gr-shd/lib/CMakeLists.txt +++ b/gr-shd/lib/CMakeLists.txt @@ -21,14 +21,14 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_SHD_INCLUDE_DIRS} -) + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${SHD_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +} -include_directories(${SHD_INCLUDE_DIRS}) link_directories(${SHD_LIBRARY_DIRS}) - -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) ######################################################################## diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt index b61adfcad..364656b86 100644 --- a/gr-shd/swig/CMakeLists.txt +++ b/gr-shd/swig/CMakeLists.txt @@ -28,6 +28,8 @@ set(GR_SWIG_FLAGS -DGR_HAVE_SHD) #needed to parse shd_swig.i set(GR_SWIG_INCLUDE_DIRS ${GR_SHD_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/shd_swig_doc.i) |