latex
/
vban
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48 from NeroBurner/fix_cmake_backend_defines 

cmake: fix backend defines
This commit is contained in:
quiniouben 2020-02-18 09:09:56 +01:00 committed by GitHub
parent f9777958e6 a3fea2fe91
commit 585d021d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -44,7 +44,6 @@ if(WITH_ALSA)
find_package(ALSA QUIET)
if(ALSA_FOUND)
message(STATUS "found dependency ALSA: ${ALSA_VERSION_STRING} '${ALSA_INCLUDE_DIRS}' '${ALSA_LIBRARIES}'")
set(ALSA)
else()
message(FATAL_ERROR "missing ALSA dependency. If you want to disable backend set WITH_ALSA=No")
endif()
@ -55,7 +54,6 @@ if(WITH_PULSEAUDIO)
find_package(PulseAudio QUIET)
if(PulseAudio_FOUND)
message(STATUS "found dependency PulseAudio: ${PULSEAUDIO_VERSION} '${PULSEAUDIO_INCLUDE_DIR}' '${PULSEAUDIO_LIBRARY}'")
set(PULSEAUDIO)
else()
message(FATAL_ERROR "missing PulseAudio dependency. If you want to disable backend set WITH_PULSEAUDIO=No")
endif()
@ -67,7 +65,6 @@ if(WITH_JACK)
pkg_search_module(JACK jack QUIET)
if(JACK_FOUND)
message(STATUS "found dependency JACK: ${JACK_VERSION} '${JACK_INCLUDEDIR}' '${JACK_LIBRARIES}'")
set(JACK)
else()
message(STATUS "missing JACK dependency, disabling backend")
message(FATAL_ERROR "missing JACK dependency. If you want to disable backend set WITH_JACK=No")

32
src/CMakeLists.txt
View File

@ -53,26 +53,28 @@ include(GNUInstallDirs)
foreach(exe vban_receptor vban_emitter vban_sendtext)
target_include_directories(${exe} PRIVATE .)
if(ALSA)
target_compile_definition( ${exe} PRIVATE ALSA)
target_include_directories(${exe} PRIVATE "${ALSA_INCLUDE_DIRS}")
target_link_libraries( ${exe} PRIVATE "${ALSA_LIBRARIES}")
if(WITH_ALSA)
target_compile_definitions(${exe} PRIVATE ALSA)
target_include_directories(${exe} PRIVATE ${ALSA_INCLUDE_DIRS})
target_link_libraries( ${exe} PRIVATE ${ALSA_LIBRARIES})
endif()
if(PULSEAUDIO)
target_compile_definition( ${exe} PRIVATE PULSEAUDIO)
target_include_directories(${exe} PRIVATE "${PulSEAudio_INCLUDE_DIRS}")
target_link_libraries( ${exe} PRIVATE "${PulseAudio_LIBRARIES}")
if(WITH_PULSEAUDIO)
target_compile_definitions(${exe} PRIVATE PULSEAUDIO)
target_include_directories(${exe} PRIVATE ${PULSEAUDIO_INCLUDE_DIR})
# can't find something about pulse-simple in the pulseaudioconfig.cmake file,
# hard code the linking as it is needed
target_link_libraries( ${exe} PRIVATE pulse-simple ${PULSEAUDIO_LIBRARY})
endif()
if(JACK)
target_compile_definition( ${exe} PRIVATE JACK)
target_include_directories(${exe} PRIVATE "${JACK_INCLUDE_DIR}")
target_link_libraries( ${exe} PRIVATE "${JACK_LIBRARIES}")
if(WITH_JACK)
target_compile_definitions(${exe} PRIVATE JACK)
target_include_directories(${exe} PRIVATE ${JACK_INCLUDE_DIR})
target_link_libraries( ${exe} PRIVATE ${JACK_LIBRARIES})
endif()
install(TARGETS ${exe} DESTINATION "${CMAKE_INSTALL_BINDIR}")
endforeach()
if(ALSA)
if(WITH_ALSA)
target_sources(vban_receptor PRIVATE
common/backend/alsa_backend.h
common/backend/alsa_backend.c)
@ -81,7 +83,7 @@ if(ALSA)
common/backend/alsa_backend.c)
endif()
if(PULSEAUDIO)
if(WITH_PULSEAUDIO)
target_sources(vban_receptor PRIVATE
common/backend/pulseaudio_backend.h
common/backend/pulseaudio_backend.c)
@ -90,7 +92,7 @@ if(PULSEAUDIO)
common/backend/pulseaudio_backend.c)
endif()
if(JACK)
if(WITH_JACK)
target_sources(vban_receptor PRIVATE
common/backend/jack_backend.h
common/backend/jack_backend.c)