diff options
-rw-r--r-- | cmake/Modules/FindQwt.cmake | 2 | ||||
-rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index f2cf3440d..db5ca6d27 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -11,6 +11,7 @@ find_path (QWT_INCLUDE_DIRS /usr/include/qwt-qt4 /usr/include/qwt /opt/local/include/qwt + /opt/local/lib/qwt.framework/Headers /sw/include/qwt ) @@ -20,6 +21,7 @@ find_library (QWT_LIBRARIES /usr/local/lib /usr/lib /opt/local/lib + /opt/local/lib/qwt.framework /sw/lib ) diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 5b740d916..72a2534f7 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -26,7 +26,6 @@ link_directories(${Boost_LIBRARY_DIRS}) set(GR_SWIG_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - ${GSL_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} |