From c85bc12559cbeaa3e18544a459adab147267007e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 12 Jan 2012 17:29:01 -0600 Subject: [PATCH] Add jack support to CMake --- CMakeLists.txt | 14 ++++++++++++++ config.h.cmake | 2 ++ flow/CMakeLists.txt | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44d83d1..7b6230f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON ) option( WITH_VORBIS "Enable Ogg/Vorbis support" ON ) option( WITH_MAD "Enable MAD mp3 decoder support" ON ) option( WITH_ESOUND "Enable ESOUND support" ${WITH_ALL_OPTIONS} ) +option( WITH_JACK "Enable JACK support" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) @@ -165,6 +166,19 @@ if( WITH_ESOUND ) endif( WITH_ESOUND ) +##### check for JACK ############################ + +set( HAVE_LIBJACK 0 ) +if( WITH_JACK ) + pkg_search_module( LIBJACK jack ) + if( LIBJACK_FOUND ) + set( HAVE_LIBJACK 1 ) + else( LIBJACK_FOUND ) + message(FATAL_ERROR "\nJACK support is requested, but `jack.pc` was not found" ) + endif( LIBJACK_FOUND ) +endif( WITH_JACK ) + + ##### check for glib/gthread modules ############ pkg_search_module( GLIB2 glib-2.0 ) diff --git a/config.h.cmake b/config.h.cmake index f279385..e653857 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -37,3 +37,5 @@ #cmakedefine HAVE_SYS_SOUNDCARD_H 1 #cmakedefine HAVE_LIBPTHREAD 1 #define HAVE_IOCTL_INT_ULONGINT_DOTS 3 + +#cmakedefine HAVE_LIBJACK 1 diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt index 3ab8fd2..da41aee 100644 --- a/flow/CMakeLists.txt +++ b/flow/CMakeLists.txt @@ -66,7 +66,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} + LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} ${LIBJACK_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} )