Merge branch 'blender-v2.82-release'

2020-02-06 01:24:49 +11:00
parent edcec3aee0 87c18fbbc5
commit be70fcd7f2
40 changed files with 0 additions and 114 deletions
--- a/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_blosc_SEARCH_DIRS
  ${BLOSC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/blosc
 )

--- a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_cppunit_SEARCH_DIRS
  ${CPPUNIT_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/cppunit
 )

--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -124,7 +124,6 @@ set(IlmBase_generic_include_paths
  /usr/include
  /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/include
-  /sw/include
  /opt/local/include
 )
 set(IlmBase_generic_library_paths
@@ -133,7 +132,6 @@ set(IlmBase_generic_library_paths
  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/lib
  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  /sw/lib
  /opt/local/lib
 )

--- a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_logc4plus_SEARCH_DIRS
  ${LOGC4PLUS_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/logc4plus
 )

--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -119,7 +119,6 @@ set(OpenEXR_generic_include_paths
  /usr/include
  /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/include
-  /sw/include
  /opt/local/include
 )
 set(OpenEXR_generic_library_paths
@@ -128,7 +127,6 @@ set(OpenEXR_generic_library_paths
  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/lib
  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  /sw/lib
  /opt/local/lib
 )

--- a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_tbb_SEARCH_DIRS
  ${TBB_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/tbb
 )

--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -27,9 +27,6 @@ ENDIF()

 SET(_alembic_SEARCH_DIRS
  ${ALEMBIC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/alembic
 )

--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@@ -17,9 +17,6 @@ ENDIF()

 SET(_audaspace_SEARCH_DIRS
  ${AUDASPACE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 # Use pkg-config to get hints about paths
--- a/build_files/cmake/Modules/FindBlosc.cmake
+++ b/build_files/cmake/Modules/FindBlosc.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_blosc_SEARCH_DIRS
  ${BLOSC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/blosc
 )

--- a/build_files/cmake/Modules/FindEigen3.cmake
+++ b/build_files/cmake/Modules/FindEigen3.cmake
@@ -25,9 +25,6 @@ ENDIF()

 SET(_eigen3_SEARCH_DIRS
  ${EIGEN3_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(EIGEN3_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -29,10 +29,6 @@ ENDIF()

 SET(_embree_SEARCH_DIRS
  ${EMBREE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/embree
  /opt/lib/embree
 )

--- a/build_files/cmake/Modules/FindFftw3.cmake
+++ b/build_files/cmake/Modules/FindFftw3.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_fftw3_SEARCH_DIRS
  ${FFTW3_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(FFTW3_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -28,7 +28,6 @@ ENDIF()

 SET(_glew_SEARCH_DIRS
  ${GLEW_ROOT_DIR}
-  /usr/local
 )

 FIND_PATH(GLEW_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindGflags.cmake
+++ b/build_files/cmake/Modules/FindGflags.cmake
@@ -444,7 +444,6 @@ if(NOT GFLAGS_FOUND)
    /opt/local/var/macports/software # Mac OS X.
    /opt/local/include
    /usr/include
-    /sw/include # Fink
    /opt/lib/gflags/include)

  list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
@@ -457,7 +456,6 @@ if(NOT GFLAGS_FOUND)
    /usr/local/homebrew/lib # Mac OS X.
    /opt/local/lib
    /usr/lib
-    /sw/lib # Fink
    /opt/lib/gflags/lib)
  list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
    gflags/lib # Windows (for C:/Program Files prefix).
--- a/build_files/cmake/Modules/FindGlog.cmake
+++ b/build_files/cmake/Modules/FindGlog.cmake
@@ -128,7 +128,6 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS
  /opt/local/var/macports/software # Mac OS X.
  /opt/local/include
  /usr/include
-  /sw/include # Fink
  /opt/lib/glog/include)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_PATH_SUFFIXES
@@ -143,7 +142,6 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS
  /usr/local/homebrew/lib # Mac OS X.
  /opt/local/lib
  /usr/lib
-  /sw/lib # Fink
  /opt/lib/gflags/lib)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES
--- a/build_files/cmake/Modules/FindHDF5.cmake
+++ b/build_files/cmake/Modules/FindHDF5.cmake
@@ -26,9 +26,6 @@ ENDIF()

 SET(_hdf5_SEARCH_DIRS
  ${HDF5_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/hdf5
 )

--- a/build_files/cmake/Modules/FindIcuLinux.cmake
+++ b/build_files/cmake/Modules/FindIcuLinux.cmake
@@ -32,9 +32,6 @@ endif()

 SET(_icu_SEARCH_DIRS
  ${ICU_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 # We don't need includes, only libs to link against...
--- a/build_files/cmake/Modules/FindJack.cmake
+++ b/build_files/cmake/Modules/FindJack.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_jack_SEARCH_DIRS
  ${JACK_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(JACK_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindJeMalloc.cmake
+++ b/build_files/cmake/Modules/FindJeMalloc.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_jemalloc_SEARCH_DIRS
  ${JEMALLOC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/jemalloc
 )

--- a/build_files/cmake/Modules/FindLZO.cmake
+++ b/build_files/cmake/Modules/FindLZO.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_lzo_SEARCH_DIRS
  ${LZO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h
--- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake
+++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
@@ -62,9 +62,6 @@ SET(_opencollada_FIND_STATIC_COMPONENTS

 SET(_opencollada_SEARCH_DIRS
  ${OPENCOLLADA_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/opencollada
 )

--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -35,9 +35,6 @@ SET(_opencolorio_FIND_COMPONENTS

 SET(_opencolorio_SEARCH_DIRS
  ${OPENCOLORIO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/ocio
 )

--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -47,9 +47,6 @@ SET(_openexr_FIND_COMPONENTS

 SET(_openexr_SEARCH_DIRS
  ${OPENEXR_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/openexr
 )

--- a/build_files/cmake/Modules/FindOpenGLES.cmake
+++ b/build_files/cmake/Modules/FindOpenGLES.cmake
@@ -17,7 +17,6 @@ ENDIF()

 SET(_opengles_SEARCH_DIRS
  ${OPENGLES_ROOT_DIR}
-  /usr/local
 )

 FIND_PATH(OPENGLES_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake
+++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_openimagedenoise_SEARCH_DIRS
  ${OPENIMAGEDENOISE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/openimagedenoise
 )

--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -31,9 +31,6 @@ ENDIF()

 SET(_openimageio_SEARCH_DIRS
  ${OPENIMAGEIO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/oiio
 )

--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_openjpeg_SEARCH_DIRS
  ${OPENJPEG_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(OPENJPEG_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake
+++ b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake
@@ -35,9 +35,6 @@ SET(_osl_FIND_COMPONENTS

 SET(_osl_SEARCH_DIRS
  ${OSL_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/osl
 )

--- a/build_files/cmake/Modules/FindOpenSubdiv.cmake
+++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake
@@ -34,9 +34,6 @@ SET(_opensubdiv_FIND_COMPONENTS

 SET(_opensubdiv_SEARCH_DIRS
  ${OPENSUBDIV_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/opensubdiv
  /opt/lib/osd # install_deps.sh
 )
--- a/build_files/cmake/Modules/FindOpenVDB.cmake
+++ b/build_files/cmake/Modules/FindOpenVDB.cmake
@@ -29,10 +29,6 @@ ENDIF()

 SET(_openvdb_SEARCH_DIRS
  ${OPENVDB_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/openvdb
  /opt/lib/openvdb
 )

--- a/build_files/cmake/Modules/FindOptiX.cmake
+++ b/build_files/cmake/Modules/FindOptiX.cmake
@@ -26,9 +26,6 @@ ENDIF()
 SET(_optix_SEARCH_DIRS
  ${OPTIX_ROOT_DIR}
  "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.0.0"
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(OPTIX_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindPCRE.cmake
+++ b/build_files/cmake/Modules/FindPCRE.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_pcre_SEARCH_DIRS
  ${PCRE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(PCRE_INCLUDE_DIR pcre.h
--- a/build_files/cmake/Modules/FindPugiXML.cmake
+++ b/build_files/cmake/Modules/FindPugiXML.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_pugixml_SEARCH_DIRS
  ${PUGIXML_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/oiio
 )

--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -71,7 +71,6 @@ STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 SET(_python_SEARCH_DIRS
  ${PYTHON_ROOT_DIR}
  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
-  "/opt/py${_PYTHON_VERSION_NO_DOTS}"
  "/opt/lib/python-${PYTHON_VERSION}"
 )

--- a/build_files/cmake/Modules/FindSDL2.cmake
+++ b/build_files/cmake/Modules/FindSDL2.cmake
@@ -28,12 +28,6 @@ ENDIF()

 SET(_sdl2_SEARCH_DIRS
  ${SDL2_ROOT_DIR}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(SDL2_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_sndfile_SEARCH_DIRS
  ${LIBSNDFILE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h
--- a/build_files/cmake/Modules/FindSpacenav.cmake
+++ b/build_files/cmake/Modules/FindSpacenav.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_spacenav_SEARCH_DIRS
  ${SPACENAV_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(SPACENAV_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindTBB.cmake
+++ b/build_files/cmake/Modules/FindTBB.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_tbb_SEARCH_DIRS
  ${TBB_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
  /opt/lib/tbb
 )

--- a/build_files/cmake/Modules/FindUSD.cmake
+++ b/build_files/cmake/Modules/FindUSD.cmake
@@ -27,9 +27,7 @@ ENDIF()

 SET(_usd_SEARCH_DIRS
  ${USD_ROOT_DIR}
-  /usr/local
  /opt/lib/usd
-  /opt/usd
 )

 FIND_PATH(USD_INCLUDE_DIR
--- a/build_files/cmake/Modules/FindXML2.cmake
+++ b/build_files/cmake/Modules/FindXML2.cmake
@@ -29,9 +29,6 @@ ENDIF()

 SET(_xml2_SEARCH_DIRS
  ${XML2_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
 )

 FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h