diff options
| author | Josh Blum | 2012-12-03 14:58:14 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-12-04 09:16:10 -0800 |
| commit | e26d2cf197aeb077f321c73e7a057a58d7117f38 (patch) | |
| tree | cab7207e8dab4fb89a9066e528c3550b472a3548 /gnuradio-core | |
| parent | 32e9190a47109d51639b897c11a75bfd6f30f3f7 (diff) | |
| download | gnuradio-e26d2cf197aeb077f321c73e7a057a58d7117f38.tar.gz gnuradio-e26d2cf197aeb077f321c73e7a057a58d7117f38.tar.bz2 gnuradio-e26d2cf197aeb077f321c73e7a057a58d7117f38.zip | |
core: moving Boost_INCLUDE_DIRS to be last
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 4e76b3c5a..d773280e6 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -60,6 +60,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier + ${Boost_INCLUDE_DIRS} ) GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 72a2534f7..734547131 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -25,10 +25,9 @@ include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) set(GR_SWIG_INCLUDE_DIRS - ${Boost_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} ) set(GR_SWIG_LIBRARIES gnuradio-core) |