Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-07-10 12:25:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-07-10 12:25:47 +0300
commit80373bc4d2b4b22d21088957163c19b537f64c7e (patch)
treebeb5821107e3522b6fc3176a5e69097126a6e864
parent719629f2aa8cc146427b68bd6fcf422bdd1e52b0 (diff)
CMake: Disable OpenAL and JACK when AUDASPACE is disabled
Previously CMake was raising a fatal error, which wasn't too helpful. There is still some fatal messages about Audaspace and Game Engine, but the latter one is on it's EOL and is removed in Blender 2.8.
-rw-r--r--CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46d91286467..da333286478 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -638,10 +638,12 @@ endif()
if(NOT WITH_AUDASPACE)
if(WITH_OPENAL)
- message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+ message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled")
+ set(WITH_OPENAL OFF)
endif()
if(WITH_JACK)
- message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+ message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled")
+ set(WITH_JACK OFF)
endif()
if(WITH_GAMEENGINE)
message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")