Fix T61253: Wrong syntax highlighting when @ is used as multiplication
[blender.git] / CMakeLists.txt
index 1813f9a15efab88acf3f92f506b7ed8d7989c7d7..2662859b76d0759c6040bf6a7068e21cfa78153b 100644 (file)
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
 # ***** END GPL LICENSE BLOCK *****
 
 #-----------------------------------------------------------------------------
@@ -763,8 +758,8 @@ if(WITH_PYTHON)
        # Do this before main 'platform_*' checks,
        # because UNIX will search for the old Python paths which may not exist.
        # giving errors about missing paths before this case is met.
-       if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.6")
-               message(FATAL_ERROR "At least Python 3.6 is required to build")
+       if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.7")
+               message(FATAL_ERROR "At least Python 3.7 is required to build")
        endif()
 
        if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules")
@@ -1122,7 +1117,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}")