diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-06-20 07:46:50 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-06-20 07:46:50 -0700 |
| commit | c6c16f89f2ffe1a69afb92526a0ce12f80dd6eca (patch) | |
| tree | e1a55753e4853cd1b27beaf84f348c5f70860533 /gr-wavelet | |
| parent | a8c8c4c5eb2acd727d625b333c5f9206e53e448d (diff) | |
| parent | 446494ea3bb021cb0b423c13bde2689c5046fe39 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-wavelet')
| -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 b2a5249146..2d4382b765 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}) |