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:27:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-07-10 12:27:48 +0300
commit427e5ef3427f3a6e026aae5e98deb43cb9d3a96f (patch)
treebb6bc5eda977f4e28285444124d9e580828ece6a /CMakeLists.txt
parent0bfc06b7b7ef797df12a99bdd3630756e590df88 (diff)
parent80373bc4d2b4b22d21088957163c19b537f64c7e (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d2bcc4b0af..2961aafe908 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -624,10 +624,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()
endif()