diff options
| author | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
|---|---|---|
| committer | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
| commit | c03114f9861920b246c36bb7e6b2098dadacd60e (patch) | |
| tree | 3e15aff8e513d7b745f971fd5de0023d6135d83c /gnuradio-core/src/lib/swig | |
| parent | 68e99469dddd3b0347f59d0e3f50c60379390351 (diff) | |
| parent | baaf2b6cf06f464a710c3f36db4c9275dd915d92 (diff) | |
Merge master/fix_build_dir_order into next, then fix conflicts and redo come of the INCLUDE_DIRS order
Diffstat (limited to 'gnuradio-core/src/lib/swig')
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 6a989616d1..021a62ab30 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -21,23 +21,22 @@ include(GrPython) include(GrSwig) -include_directories(${Boost_INCLUDE_DIRS}) -link_directories(${Boost_LIBRARY_DIRS}) - set(GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} - ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_LIBRARIES gnuradio-core) if(ENABLE_GR_CTRLPORT) list(APPEND GR_SWIG_FLAGS -DGR_CTRLPORT) - list(APPEND GR_SWIG_LIBRARIES - ${ICE_LIBRARIES} - ) + list(APPEND GR_SWIG_LIBRARIES ${ICE_LIBRARIES}) + list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) +link_directories(${Boost_LIBRARY_DIRS}) + ######################################################################## # Build and install the swig targets ######################################################################## |