diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-09 14:24:50 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-09 14:24:50 +0300 |
commit | e66c59129c3e211125d67699d17e71c23993e0a4 (patch) | |
tree | 9e5bfe90280ee51e48eb10406a4ae210c688a2bf /build_files | |
parent | 56b547aa9db720f4f28bca8e30b6a991c2a425a5 (diff) | |
parent | b522e834ec3025a9db8abd2c57fae2704dde4d2a (diff) |
Merge branch 'master' into newboolean
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/Modules/FindAlembic.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindBlosc.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindEmbree.cmake | 12 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindGLEW.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOSL.cmake (renamed from build_files/cmake/Modules/FindOpenShadingLanguage.cmake) | 0 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 3 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenSubdiv.cmake | 3 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenVDB.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake (renamed from build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake) | 2 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 4 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 6 |
11 files changed, 10 insertions, 28 deletions
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index 2d69613ad84..45cda7ae2c5 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -51,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY # handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR) IF(ALEMBIC_FOUND) SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY}) diff --git a/build_files/cmake/Modules/FindBlosc.cmake b/build_files/cmake/Modules/FindBlosc.cmake index bec934ad7c3..e0baa2d3382 100644 --- a/build_files/cmake/Modules/FindBlosc.cmake +++ b/build_files/cmake/Modules/FindBlosc.cmake @@ -53,7 +53,7 @@ FIND_LIBRARY(BLOSC_LIBRARY # handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(BLOSC DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Blosc DEFAULT_MSG BLOSC_LIBRARY BLOSC_INCLUDE_DIR) IF(BLOSC_FOUND) diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index fa613f62308..90cf23d3e13 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -7,9 +7,6 @@ # EMBREE_ROOT_DIR, The base directory to search for Embree. # This can also be an environment variable. # EMBREEFOUND, If false, do not try to use Embree. -# -# also defined, but not for general use are -# EMBREE_LIBRARY, where to find the Embree library. #============================================================================= # Copyright 2018 Blender Foundation. @@ -70,15 +67,6 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS}) ENDFOREACH() -FIND_LIBRARY(EMBREE_LIBRARY - NAMES - libembree3 - HINTS - ${_embree_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib -) - # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 652b0835807..390e3878d6a 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -51,7 +51,7 @@ FIND_LIBRARY(GLEW_LIBRARY # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG GLEW_LIBRARY GLEW_INCLUDE_DIR) IF(GLEW_FOUND) diff --git a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake b/build_files/cmake/Modules/FindOSL.cmake index 07ed2c86e19..07ed2c86e19 100644 --- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake +++ b/build_files/cmake/Modules/FindOSL.cmake diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index acf9e9ed9ce..239d46499b9 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -7,9 +7,6 @@ # OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA. # This can also be an environment variable. # OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA. -# -# also defined, but not for general use are -# OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library. #============================================================================= # Copyright 2011 Blender Foundation. diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index d7a8567a399..2c9fbf0ba60 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -7,9 +7,6 @@ # OPENSUBDIV_ROOT_DIR, the base directory to search for OpenSubdiv. # This can also be an environment variable. # OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv. -# -# also defined, but not for general use are -# OPENSUBDIV_LIBRARY, where to find the OpenSubdiv library. #============================================================================= # Copyright 2013 Blender Foundation. diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake index 2a1378e3a2b..5f24231fcf4 100644 --- a/build_files/cmake/Modules/FindOpenVDB.cmake +++ b/build_files/cmake/Modules/FindOpenVDB.cmake @@ -53,7 +53,7 @@ FIND_LIBRARY(OPENVDB_LIBRARY # handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENVDB DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR) IF(OPENVDB_FOUND) diff --git a/build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake index 71b40ec1bde..567a0101b4a 100644 --- a/build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake +++ b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake @@ -59,7 +59,7 @@ FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY # handle the QUIETLY and REQUIRED arguments and set XR_OPENXR_SDK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OPENXR_SDK DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OpenXR_SDK DEFAULT_MSG XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) IF(XR_OPENXR_SDK_FOUND) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index d94552fbf4a..1afd681e538 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -439,8 +439,8 @@ if(WITH_OPENMP) endif() if(WITH_XR_OPENXR) - find_package(OpenXR-SDK) - if(NOT OPENXR_SDK_FOUND) + find_package(XR_OpenXR_SDK) + if(NOT XR_OPENXR_SDK_FOUND) message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR") set(WITH_XR_OPENXR OFF) endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index a75bd4eec95..df7feba2752 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -234,10 +234,10 @@ endif() if(WITH_CYCLES_OSL) set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation") - if(NOT OSL_ROOT) + if(EXISTS ${CYCLES_OSL} AND NOT OSL_ROOT) set(OSL_ROOT ${CYCLES_OSL}) endif() - find_package_wrapper(OpenShadingLanguage) + find_package_wrapper(OSL) if(OSL_FOUND) if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6") # Note: --whole-archive is needed to force loading of all symbols in liboslexec, @@ -437,7 +437,7 @@ if(WITH_GMP) endif() if(WITH_XR_OPENXR) - find_package(XR-OpenXR-SDK) + find_package(XR_OpenXR_SDK) if(NOT XR_OPENXR_SDK_FOUND) message(WARNING "OpenXR-SDK not found, disabling WITH_XR_OPENXR") set(WITH_XR_OPENXR OFF) |