diff options
| author | Johnathan Corgan | 2012-06-20 07:58:00 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-06-20 07:58:00 -0700 |
| commit | 2036030273d1c4842670ca3b2bd96e72aa408c9e (patch) | |
| tree | 46d627b9a6114d3f2ac5c52f2d430d5bec800818 /gr-wavelet/lib/CMakeLists.txt | |
| parent | 439b427e80ebc767db6e4e732213d89c2a6febd4 (diff) | |
| parent | 446494ea3bb021cb0b423c13bde2689c5046fe39 (diff) | |
| download | gnuradio-2036030273d1c4842670ca3b2bd96e72aa408c9e.tar.gz gnuradio-2036030273d1c4842670ca3b2bd96e72aa408c9e.tar.bz2 gnuradio-2036030273d1c4842670ca3b2bd96e72aa408c9e.zip | |
Merge branch 'master' into wip/gr-blocks-master
Diffstat (limited to 'gr-wavelet/lib/CMakeLists.txt')
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index d0c632800..9594f6a6a 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -21,19 +21,16 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_WAVELET_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${GSL_INCLUDE_DIRS} ) -include_directories(${WAVELET_INCLUDE_DIRS}) 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}) add_definitions(${GSL_DEFINITIONS}) |