diff options
| author | Michael L Dickens | 2013-01-03 10:30:33 -0500 |
|---|---|---|
| committer | Michael L Dickens | 2013-01-03 10:30:33 -0500 |
| commit | baaf2b6cf06f464a710c3f36db4c9275dd915d92 (patch) | |
| tree | fd530f3eaa05daef7dec58ee60dd15a63d9361bc | |
| parent | 790d68a15bf1766dbb4a77a97e8b59c061de4694 (diff) | |
| download | gnuradio-baaf2b6cf06f464a710c3f36db4c9275dd915d92.tar.gz gnuradio-baaf2b6cf06f464a710c3f36db4c9275dd915d92.tar.bz2 gnuradio-baaf2b6cf06f464a710c3f36db4c9275dd915d92.zip | |
Reorder SWIG_INCLUDE_DIRS
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 0a4ea3c30..b27710354 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -62,10 +62,10 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ) GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS + ${GNURADIO_CORE_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_SOURCE_DIR}/gruel/src/swig ${CMAKE_BINARY_DIR}/gruel/src/swig - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig - ${GNURADIO_CORE_INCLUDE_DIRS} ) ######################################################################## diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index a5e3f9399..aeceaa605 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -24,7 +24,11 @@ include(GrPython) include(GrSwig) set(GR_SWIG_TARGET_DEPS pmt_generated) -set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS}) +set(GR_SWIG_INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) set(GR_SWIG_LIBRARIES gruel) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i) |