diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 11:21:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 11:21:31 -0400 |
| commit | dc578ff0900cf0bfc4ebcc8585f85672b63735cd (patch) | |
| tree | d404fe9a5f9ba417cac9349933da893020100270 /cmake | |
| parent | 54b2f154d508f1e9f9d321609ddb8ccc764f0ae6 (diff) | |
| parent | 51b5ef97705781ca2f8a50547a2664936e6ecb40 (diff) | |
Merge remote-tracking branch 'osh/next' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-analog/swig/analog_swig.i
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index db5ca6d27e..eba3e64e31 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -5,6 +5,8 @@ find_path (QWT_INCLUDE_DIRS NAMES qwt_plot.h + HINTS + ${CMAKE_INSTALL_PREFIX}/include/qwt PATHS /usr/local/include/qwt-qt4 /usr/local/include/qwt @@ -16,7 +18,10 @@ find_path (QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt-qt4 qwt + NAMES qwt qwt-qt4 + HINTS + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 PATHS /usr/local/lib /usr/lib |