Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 09:27:48 +0000 (11:27 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 09:27:48 +0000 (11:27 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
index 4d2bcc4b0af8749f29c524b5ff9a8ffc36fc3068,da3332864785a2df607a4fef9853984b1a7da84a..2961aafe908fcf3f4667bfccb37e0a2eea2df732
@@@ -624,11 -638,16 +624,13 @@@ 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")
 -      endif()
  endif()
  
  if(NOT WITH_SDL AND WITH_GHOST_SDL)