From 1efcec7790aa81a540d365a34a277f957babb1ad Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 9 Jul 2018 16:47:00 +0100 Subject: [PATCH] Removing unsetting jack headers path so weakjack can benefit it (#4373) --- CMakeLists.txt | 2 +- src/3rdparty/weakjack/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 026b034ef..503237cd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,7 +383,6 @@ IF(WANT_JACK) SET(LMMS_HAVE_WEAKJACK TRUE) SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack) SET(STATUS_JACK "OK (weak linking enabled)") - SET(JACK_INCLUDE_DIRS "") # use dlsym instead SET(JACK_LIBRARIES ${CMAKE_DL_LIBS}) ELSE() @@ -391,6 +390,7 @@ IF(WANT_JACK) ENDIF() SET(LMMS_HAVE_JACK TRUE) ELSE(JACK_FOUND) + SET(JACK_INCLUDE_DIRS "") SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) " "if you require JACK support") ENDIF(JACK_FOUND) diff --git a/src/3rdparty/weakjack/CMakeLists.txt b/src/3rdparty/weakjack/CMakeLists.txt index b9f24e331..7600c3915 100644 --- a/src/3rdparty/weakjack/CMakeLists.txt +++ b/src/3rdparty/weakjack/CMakeLists.txt @@ -7,6 +7,6 @@ IF(LMMS_HAVE_WEAKJACK) # Library stub for AppImages running on systems without jack ADD_LIBRARY(weakjack MODULE weakjack/weak_libjack.c weakjack/weak_libjack.h) - TARGET_INCLUDE_DIRECTORIES(weakjack PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/weakjack) + TARGET_INCLUDE_DIRECTORIES(weakjack PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/weakjack ${JACK_INCLUDE_DIRS}) INSTALL(TARGETS weakjack LIBRARY DESTINATION "${PLUGIN_DIR}/optional") ENDIF()