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-digital | |
| 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-digital')
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | gr-digital/swig/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 155a10098..6f83ff036 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -21,16 +21,16 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GR_ANALOG_INCLUDE_DIRS} - ${GR_DIGITAL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../include + ${GR_DIGITAL_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) - ######################################################################## # generate helper scripts to expand templated files ######################################################################## diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index efbd1c2c9..746bc6111 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -105,11 +105,13 @@ execute_process( ) set(GR_SWIG_INCLUDE_DIRS - ${GR_ANALOG_INCLUDE_DIRS} - ${GR_DIGITAL_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../include + ${GR_DIGITAL_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} + ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) # Setup swig docs to depend on includes and pull in from build directory |