Merge branch 'blender2.7'

2019-01-26 15:54:13 +01:00
parent 115e1d441b b7a9e980a1
commit 94d88df3a8
9 changed files with 38 additions and 15 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1122,7 +1122,10 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure OpenMP.
 if(WITH_OPENMP)
-	find_package(OpenMP)
+	if(NOT OPENMP_CUSTOM)
+		find_package(OpenMP)
+	endif()
+
 	if(OPENMP_FOUND)
 		if(NOT WITH_OPENMP_STATIC)
 			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")