diff options
| author | Michael Dickens | 2012-04-09 08:50:42 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-09 08:50:42 -0700 |
| commit | 79cf7ef66d7baf76a3f319c263919b0048441530 (patch) | |
| tree | 7103a365d68e4c04839926313da618bdc5519ccf | |
| parent | d8531850cab78d763f6dc9cd0c2eb83c5bc6f5b2 (diff) | |
| download | gnuradio-79cf7ef66d7baf76a3f319c263919b0048441530.tar.gz gnuradio-79cf7ef66d7baf76a3f319c263919b0048441530.tar.bz2 gnuradio-79cf7ef66d7baf76a3f319c263919b0048441530.zip | |
wavelet: fix swig paths for OSX
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-wavelet/swig/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index dd5e1500d..01171956c 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -33,6 +33,9 @@ link_directories(${WAVELET_LIBRARY_DIRS}) include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) +include_directories(${GSL_INCLUDE_DIRS}) +link_directories(${GSL_LIBRARY_DIRS}) + ######################################################################## # Setup library ######################################################################## diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt index e91915d86..82d083dea 100644 --- a/gr-wavelet/swig/CMakeLists.txt +++ b/gr-wavelet/swig/CMakeLists.txt @@ -26,12 +26,13 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_WAVELET_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GSL_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) -set(GR_SWIG_LIBRARIES gnuradio-wavelet) +set(GR_SWIG_LIBRARIES gnuradio-wavelet ${GSL_LDFLAGS}) GR_SWIG_MAKE(wavelet_swig wavelet_swig.i) |