[Bf-blender-cvs] [08094e8f23a] blender2.8: Audaspace: cmake fixes, lowering to 3.0 minimum required.

[Jörg Müller]

Commit: 08094e8f23a374f8f8d1df535d0fa6c1964f8d5e
Author: Jörg Müller
Date:   Sat Aug 19 11:45:20 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB08094e8f23a374f8f8d1df535d0fa6c1964f8d5e

Audaspace: cmake fixes, lowering to 3.0 minimum required.

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

M	CMakeLists.txt
M	extern/audaspace/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ea7581ec34..4c5b2264207 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,6 +579,12 @@ if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
+if(NOT WITH_CXX11)
+	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
+		message(FATAL_ERROR "WITH_AUDASPACE requires WITH_CXX11")
+	endif()
+endif()
+
 if(NOT WITH_AUDASPACE)
 	if(WITH_OPENAL)
 		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt
index ad856fd8743..9e2921ef35a 100644
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.0)
 include(CMakeDependentOption)
 
 if(POLICY CMP0054)
@@ -309,34 +309,37 @@ endif()
 
 # compiler options
 
-set(CMAKE_CXX_STANDARD 11)
-
-if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-	list(APPEND CMAKE_C_COMPILER_FLAGS "-fvisibility=hidden")
-	list(APPEND CMAKE_CXX_COMPILER_FLAGS "-fvisibility=hidden")
-endif()
+if(AUDASPACE_STANDALONE)
+	if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+		add_definitions(-std=c++11)
+		list(APPEND CMAKE_C_COMPILER_FLAGS "-fvisibility=hidden")
+		list(APPEND CMAKE_CXX_COMPILER_FLAGS "-fvisibility=hidden")
+	endif()
 
-if(MSVC)
-	if(AUDASPACE_STANDALONE)
+	if(MSVC)
 		list(APPEND CMAKE_C_FLAGS_DEBUG "/Zi /Od")
 		list(APPEND CMAKE_CXX_FLAGS_DEBUG "/Zi /Od")
 		list(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG "/DEBUG")
 		list(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG "/DEBUG")
 		list(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG")
+
+		if(SHARED_LIBRARY)
+			include(GenerateExportHeader)
+		endif()
 	endif()
+
+	if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
+	endif()
+endif()
+
+if(MSVC)
 	add_definitions(
 		/D_USE_MATH_DEFINES
 		/EHsc
 		/DNOMINMAX
 		/D_STDINT_H
 	)
-	if(SHARED_LIBRARY)
-		include(GenerateExportHeader)
-	endif()
-endif()
-
-if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
 endif()
 
 # platform specific options