diff options
| author | Tom Rondeau | 2012-04-14 17:12:49 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-04-14 17:12:49 -0400 |
| commit | 4ab1b7f46894074b33937a21f64fc9b797b22d99 (patch) | |
| tree | 0c0027efd468f0048a272793b6db5d981ff62623 | |
| parent | eb7b7932e7d2df651f00553561b66f0337f0bede (diff) | |
| download | gnuradio-4ab1b7f46894074b33937a21f64fc9b797b22d99.tar.gz gnuradio-4ab1b7f46894074b33937a21f64fc9b797b22d99.tar.bz2 gnuradio-4ab1b7f46894074b33937a21f64fc9b797b22d99.zip | |
This patch enables JACK only when both a library and include files are available in the system.
This change helps to build gnuradio on systems which have a libjack.so library available for compatibility purposes without the header files (like gentoo where libjack.so is part of app-emulation/emul-linux-x86-soundlibs).
Signed-off-by: Maciej Grela <maciej.grela@gmail.com>
| -rw-r--r-- | cmake/Modules/FindJack.cmake | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/cmake/Modules/FindJack.cmake b/cmake/Modules/FindJack.cmake index 44417deb3..a39fd6347 100644 --- a/cmake/Modules/FindJack.cmake +++ b/cmake/Modules/FindJack.cmake @@ -51,24 +51,19 @@ else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) /sw/lib ) - if (JACK_LIBRARY) + if (JACK_LIBRARY AND JACK_INCLUDE_DIR) set(JACK_FOUND TRUE) - endif (JACK_LIBRARY) - set(JACK_INCLUDE_DIRS - ${JACK_INCLUDE_DIR} - ) + set(JACK_INCLUDE_DIRS + ${JACK_INCLUDE_DIR} + ) - if (JACK_FOUND) set(JACK_LIBRARIES ${JACK_LIBRARIES} ${JACK_LIBRARY} ) - endif (JACK_FOUND) - if (JACK_INCLUDE_DIRS AND JACK_LIBRARIES) - set(JACK_FOUND TRUE) - endif (JACK_INCLUDE_DIRS AND JACK_LIBRARIES) + endif (JACK_LIBRARY AND JACK_INCLUDE_DIR) if (JACK_FOUND) if (NOT JACK_FIND_QUIETLY) |