diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
| commit | ce211603ff8821b50f7c9ebc3931498c6f2bd374 (patch) | |
| tree | dd8b92841ef4cd0728aa1156b105e7173286627b /gnuradio-core/src/lib/swig | |
| parent | 6121d0b12bcb308586b5888b6c7e82832f692e5c (diff) | |
| parent | 4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (diff) | |
Merge branch 'master' into gr_log
Conflicts:
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/main_page.dox
gnuradio-core/gnuradio-core.conf.in
gnuradio-core/src/lib/swig/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-howto-write-a-block/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-video-sdl/src/CMakeLists.txt
Diffstat (limited to 'gnuradio-core/src/lib/swig')
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 6d73babc7f..de42cf2a49 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -21,19 +21,12 @@ include(GrPython) include(GrSwig) -include_directories(${Boost_INCLUDE_DIRS}) -link_directories(${Boost_LIBRARY_DIRS}) - -include_directories(${LOG4CXX_INCLUDE_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) - set(GR_SWIG_INCLUDE_DIRS - ${Boost_INCLUDE_DIRS} - ${GSL_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_LIBRARIES gnuradio-core @@ -46,6 +39,8 @@ if(ENABLE_GR_LOG) SET(GR_SWIG_FLAGS "-DENABLE_GR_LOG") endif(ENABLE_GR_LOG) +link_directories(${Boost_LIBRARY_DIRS}) + ######################################################################## # Build and install the swig targets ######################################################################## |