[Bf-blender-cvs] [80373bc4d2b] master: CMake: Disable OpenAL and JACK when AUDASPACE is disabled

Sergey Sharybin noreply at git.blender.org
Tue Jul 10 11:27:38 CEST 2018


Commit: 80373bc4d2b4b22d21088957163c19b537f64c7e
Author: Sergey Sharybin
Date:   Tue Jul 10 11:25:47 2018 +0200
Branches: master
https://developer.blender.org/rB80373bc4d2b4b22d21088957163c19b537f64c7e

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.

===================================================================

M	CMakeLists.txt

===================================================================

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")



More information about the Bf-blender-cvs mailing list