Remove duplicate CMake code when adding backends. #96
Conversation
|
Looks like WinMM, DSound and MMDevAPI are detected properly on Windows, but the TravisCI Linux build almost enables no backends (except OSS) because the dependencies are not installed. Is this intended? |
CMakeLists.txt
Outdated
| IF(ALSOFT_REQUIRE_ALSA AND NOT HAVE_ALSA) | ||
| MESSAGE(FATAL_ERROR "Failed to enabled required ALSA backend") | ||
| ADD_BACKEND(ALSA ALSA Alc/backends/alsa.c) | ||
| IF(ALSOFT_BACKEND_ALSA) |
There was a problem hiding this comment.
I'm not sure these should check the ALSOFT_BACKEND_* options, since they may be cached values and will stay even if the backend is no longer available. I think it makes more sense to check the HAVE_* variables.
cmake/FindWinMM.cmake
Outdated
| # WINMM_INCLUDE_DIRS - Set when WINMM_INCLUDE_DIR is found | ||
| # | ||
| # WINMM_INCLUDE_DIR - where to find dsound.h, etc. | ||
| # WINMM_LIBRARY - the dsound library |
There was a problem hiding this comment.
Seems to be a bit of a copy-paste error here.
I don't really know. I'm not familiar with using TravisCI, so I'm not sure if I can or how to enable any dependencies. |
adrianbroher
force-pushed
the
cleanup-cmake
branch
from
5145e7a
to
35888c8
Compare
Yeah, checking against a user option isn't the best idea. I replaced the
Yes, it was a copy-paste error. |
|
Seems the Android build fails, unable to find the OpenSLES lib: https://travis-ci.org/kcat/openal-soft/jobs/208520864. Can't exactly see why though, since it seems to be looking for the same lib name. Perhaps a default search path isn't being set for |
adrianbroher
force-pushed
the
cleanup-cmake
branch
from
35888c8
to
a47b4e3
Compare
adrianbroher
force-pushed
the
cleanup-cmake
branch
from
a47b4e3
to
7630be3
Compare
The PR moves some duplicated CMake code like
optiondefinitions,set-ting variables or checking for availability of a specific backend to a common CMake macro. As far as I could check this seems to work properly for the backends ALSA, OSS, PORTAUDIO, PULSEAUDIO, JACK but I haven't no ways to test the other backends, maybe the Travis/AppVeyor can give me some answers here.