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-fcd | |
| 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-fcd')
| -rw-r--r-- | gr-fcd/examples/c++/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | gr-fcd/lib/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gr-fcd/swig/CMakeLists.txt | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/gr-fcd/examples/c++/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index 05574f4a8..7ff69777d 100644 --- a/gr-fcd/examples/c++/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -17,9 +17,13 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -include_directories(${GR_FCD_INCLUDE_DIRS}) -include_directories(${GNURADIO_CORE_INCLUDE_DIRS}) -include_directories(${GR_AUDIO_INCLUDE_DIRS}) +include_directories( + ${GR_FCD_INCLUDE_DIRS} + ${GR_AUDIO_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) add_executable(fcd_nfm_rx fcd_nfm_rx.cc) target_link_libraries(fcd_nfm_rx gnuradio-fcd) diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt index 9a5605d99..a5c95ceb7 100644 --- a/gr-fcd/lib/CMakeLists.txt +++ b/gr-fcd/lib/CMakeLists.txt @@ -24,15 +24,16 @@ GR_INCLUDE_SUBDIRECTORY(fcd) # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GR_FCD_INCLUDE_DIRS} - ${GR_AUDIO_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/hid ${CMAKE_CURRENT_SOURCE_DIR}/fcd + ${GR_FCD_INCLUDE_DIRS} + ${GR_AUDIO_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${LIBUSB_INCLUDE_DIR} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) ######################################################################## diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt index f715c4785..c170f3f66 100644 --- a/gr-fcd/swig/CMakeLists.txt +++ b/gr-fcd/swig/CMakeLists.txt @@ -27,8 +27,10 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_FCD_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_AUDIO_INCLUDE_DIRS} + ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcd_swig_doc.i) |