From 4ab1b7f46894074b33937a21f64fc9b797b22d99 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 14 Apr 2012 17:12:49 -0400 Subject: 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 --- cmake/Modules/FindJack.cmake | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'cmake/Modules') 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) -- cgit