diff options
| author | Jörg Müller <nexyon@gmail.com> | 2021-03-17 00:32:16 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2021-03-17 01:21:45 +0300 |
| commit | 7b8fc307dc4ff608fc68e2decee45bae59f0c7c9 (patch) | |
| tree | 9690b32b66aec4595df83e92f9595a819b715339 /CMakeLists.txt | |
| parent | 262a0988466e95ab31b834a6479b8be7ec1023d6 (diff) | |
Audaspace: porting minor improvements from upstream
- NullDevice is now called None
- Automatic choice of best available device.
- Minor formatting, documentation and cmake fixes.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ddfce0a48d9..c0b9b28c610 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,6 +305,8 @@ if(NOT WIN32) if(UNIX AND NOT APPLE) option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries loading" OFF) endif() +else() + set(WITH_JACK OFF) endif() if(UNIX AND NOT APPLE) option(WITH_SDL_DYNLOAD "Enable runtime dynamic SDL libraries loading" OFF) @@ -671,16 +673,8 @@ if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE) ) endif() -if(NOT WITH_AUDASPACE) - if(WITH_OPENAL) - message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled") - set(WITH_OPENAL OFF) - endif() - if(WITH_JACK) - message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled") - set(WITH_JACK OFF) - endif() -endif() +set_and_warn_dependency(WITH_AUDASPACE WITH_OPENAL OFF) +set_and_warn_dependency(WITH_AUDASPACE WITH_JACK OFF) if(NOT WITH_SDL AND WITH_GHOST_SDL) message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL") |