From be83b8f456634cb627ef12a4904a5916a3d880f3 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 7 Aug 2020 16:53:06 +0200 Subject: Cleanup: CMake warnings related to "find package" modules Fix package name missmatch in a few module files. IE "ALEMBIC" was defined in the file but the find_package commands used "Alembic" Some modules state that they set and use the _LIBRARY variable but the do in fact not do this. Removed these comments from those files. --- build_files/cmake/Modules/FindAlembic.cmake | 2 +- build_files/cmake/Modules/FindBlosc.cmake | 2 +- build_files/cmake/Modules/FindEmbree.cmake | 12 --- build_files/cmake/Modules/FindGLEW.cmake | 2 +- build_files/cmake/Modules/FindOSL.cmake | 110 +++++++++++++++++++++ build_files/cmake/Modules/FindOpenCOLLADA.cmake | 3 - .../cmake/Modules/FindOpenShadingLanguage.cmake | 110 --------------------- build_files/cmake/Modules/FindOpenSubdiv.cmake | 3 - build_files/cmake/Modules/FindOpenVDB.cmake | 2 +- build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake | 73 -------------- build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake | 73 ++++++++++++++ build_files/cmake/platform/platform_apple.cmake | 4 +- build_files/cmake/platform/platform_unix.cmake | 6 +- 13 files changed, 192 insertions(+), 210 deletions(-) create mode 100644 build_files/cmake/Modules/FindOSL.cmake delete mode 100644 build_files/cmake/Modules/FindOpenShadingLanguage.cmake delete mode 100644 build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake create mode 100644 build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake (limited to 'build_files') 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/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake new file mode 100644 index 00000000000..07ed2c86e19 --- /dev/null +++ b/build_files/cmake/Modules/FindOSL.cmake @@ -0,0 +1,110 @@ +# - Find OpenShadingLanguage library +# Find the native OpenShadingLanguage includes and library +# This module defines +# OSL_INCLUDE_DIRS, where to find OSL headers, Set when +# OSL_INCLUDE_DIR is found. +# OSL_LIBRARIES, libraries to link against to use OSL. +# OSL_ROOT_DIR, the base directory to search for OSL. +# This can also be an environment variable. +# OSL_COMPILER, full path to OSL script compiler. +# OSL_FOUND, if false, do not try to use OSL. +# OSL_LIBRARY_VERSION_MAJOR, OSL_LIBRARY_VERSION_MINOR, the major +# and minor versions of OSL library if found. +# +#============================================================================= +# Copyright 2014 Blender Foundation. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +# If OSL_ROOT_DIR was defined in the environment, use it. +IF(NOT OSL_ROOT_DIR AND NOT $ENV{OSL_ROOT_DIR} STREQUAL "") + SET(OSL_ROOT_DIR $ENV{OSL_ROOT_DIR}) +ENDIF() + +SET(_osl_FIND_COMPONENTS + oslcomp + oslexec + oslquery +) + +SET(_osl_SEARCH_DIRS + ${OSL_ROOT_DIR} + /opt/lib/osl +) + +FIND_PATH(OSL_INCLUDE_DIR + NAMES + OSL/oslversion.h + HINTS + ${_osl_SEARCH_DIRS} + PATH_SUFFIXES + include +) + +SET(_osl_LIBRARIES) +FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) + STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) + + FIND_LIBRARY(OSL_${UPPERCOMPONENT}_LIBRARY + NAMES + ${COMPONENT} + HINTS + ${_osl_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib + ) + LIST(APPEND _osl_LIBRARIES "${OSL_${UPPERCOMPONENT}_LIBRARY}") +ENDFOREACH() + +FIND_PROGRAM(OSL_COMPILER oslc + HINTS ${_osl_SEARCH_DIRS} + PATH_SUFFIXES bin) + +get_filename_component(OSL_SHADER_HINT ${OSL_COMPILER} DIRECTORY) +get_filename_component(OSL_SHADER_HINT ${OSL_SHADER_DIR}/../ ABSOLUTE) + +FIND_PATH(OSL_SHADER_DIR + NAMES + stdosl.h + HINTS + ${OSL_ROOT_DIR} + ${OSL_SHADER_HINT} + $ENV{OSLHOME} + /usr/share/OSL/ + /usr/include/OSL/ + PATH_SUFFIXES + shaders +) + +# handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSL DEFAULT_MSG _osl_LIBRARIES OSL_INCLUDE_DIR OSL_COMPILER) + +IF(OSL_FOUND) + SET(OSL_LIBRARIES ${_osl_LIBRARIES}) + SET(OSL_INCLUDE_DIRS ${OSL_INCLUDE_DIR}) + + FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR + REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+[0-9]+.*$") + FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR + REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+[0-9]+.*$") + STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*" + "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR}) + STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*" + "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR}) +ENDIF(OSL_FOUND) + +MARK_AS_ADVANCED( + OSL_INCLUDE_DIR +) +FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) + STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) + MARK_AS_ADVANCED(OSL_${UPPERCOMPONENT}_LIBRARY) +ENDFOREACH() 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/FindOpenShadingLanguage.cmake b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake deleted file mode 100644 index 07ed2c86e19..00000000000 --- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake +++ /dev/null @@ -1,110 +0,0 @@ -# - Find OpenShadingLanguage library -# Find the native OpenShadingLanguage includes and library -# This module defines -# OSL_INCLUDE_DIRS, where to find OSL headers, Set when -# OSL_INCLUDE_DIR is found. -# OSL_LIBRARIES, libraries to link against to use OSL. -# OSL_ROOT_DIR, the base directory to search for OSL. -# This can also be an environment variable. -# OSL_COMPILER, full path to OSL script compiler. -# OSL_FOUND, if false, do not try to use OSL. -# OSL_LIBRARY_VERSION_MAJOR, OSL_LIBRARY_VERSION_MINOR, the major -# and minor versions of OSL library if found. -# -#============================================================================= -# Copyright 2014 Blender Foundation. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= - -# If OSL_ROOT_DIR was defined in the environment, use it. -IF(NOT OSL_ROOT_DIR AND NOT $ENV{OSL_ROOT_DIR} STREQUAL "") - SET(OSL_ROOT_DIR $ENV{OSL_ROOT_DIR}) -ENDIF() - -SET(_osl_FIND_COMPONENTS - oslcomp - oslexec - oslquery -) - -SET(_osl_SEARCH_DIRS - ${OSL_ROOT_DIR} - /opt/lib/osl -) - -FIND_PATH(OSL_INCLUDE_DIR - NAMES - OSL/oslversion.h - HINTS - ${_osl_SEARCH_DIRS} - PATH_SUFFIXES - include -) - -SET(_osl_LIBRARIES) -FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - - FIND_LIBRARY(OSL_${UPPERCOMPONENT}_LIBRARY - NAMES - ${COMPONENT} - HINTS - ${_osl_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib - ) - LIST(APPEND _osl_LIBRARIES "${OSL_${UPPERCOMPONENT}_LIBRARY}") -ENDFOREACH() - -FIND_PROGRAM(OSL_COMPILER oslc - HINTS ${_osl_SEARCH_DIRS} - PATH_SUFFIXES bin) - -get_filename_component(OSL_SHADER_HINT ${OSL_COMPILER} DIRECTORY) -get_filename_component(OSL_SHADER_HINT ${OSL_SHADER_DIR}/../ ABSOLUTE) - -FIND_PATH(OSL_SHADER_DIR - NAMES - stdosl.h - HINTS - ${OSL_ROOT_DIR} - ${OSL_SHADER_HINT} - $ENV{OSLHOME} - /usr/share/OSL/ - /usr/include/OSL/ - PATH_SUFFIXES - shaders -) - -# handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSL DEFAULT_MSG _osl_LIBRARIES OSL_INCLUDE_DIR OSL_COMPILER) - -IF(OSL_FOUND) - SET(OSL_LIBRARIES ${_osl_LIBRARIES}) - SET(OSL_INCLUDE_DIRS ${OSL_INCLUDE_DIR}) - - FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR - REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+[0-9]+.*$") - FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR - REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+[0-9]+.*$") - STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*" - "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR}) - STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*" - "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR}) -ENDIF(OSL_FOUND) - -MARK_AS_ADVANCED( - OSL_INCLUDE_DIR -) -FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - MARK_AS_ADVANCED(OSL_${UPPERCOMPONENT}_LIBRARY) -ENDFOREACH() 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 deleted file mode 100644 index 71b40ec1bde..00000000000 --- a/build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake +++ /dev/null @@ -1,73 +0,0 @@ -# - Find OpenXR-SDK libraries -# Find the native OpenXR-SDK includes and libraries -# -# Note that there is a distinction between the OpenXR standard and the SDK. The -# latter provides utilities to use the standard but is not part of it. Most -# importantly, it contains C headers and a loader library, which manages -# dynamic linking to OpenXR runtimes like Monado, Windows Mixed Reality or -# Oculus. See the repository for more details: -# https://github.com/KhronosGroup/OpenXR-SDK -# -# This module defines -# XR_OPENXR_SDK_INCLUDE_DIRS, where to find OpenXR-SDK headers, Set when -# XR_OPENXR_SDK_INCLUDE_DIR is found. -# XR_OPENXR_SDK_LIBRARIES, libraries to link against to use OpenXR. -# XR_OPENXR_SDK_ROOT_DIR, the base directory to search for OpenXR-SDK. -# This can also be an environment variable. -# XR_OPENXR_SDK_FOUND, if false, do not try to use OpenXR-SDK. -# -# also defined, but not for general use are -# XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library. - -#============================================================================= -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= - -# If XR_OPENXR_SDK_ROOT_DIR was defined in the environment, use it. -IF(NOT XR_OPENXR_SDK_ROOT_DIR AND NOT $ENV{XR_OPENXR_SDK_ROOT_DIR} STREQUAL "") - SET(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR}) -ENDIF() - -SET(_xr_openxr_sdk_SEARCH_DIRS - ${XR_OPENXR_SDK_ROOT_DIR} - /opt/lib/xr-openxr-sdk -) - -FIND_PATH(XR_OPENXR_SDK_INCLUDE_DIR - NAMES - openxr/openxr.h - HINTS - ${_xr_openxr_sdk_SEARCH_DIRS} - PATH_SUFFIXES - include -) - -FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY - NAMES - openxr_loader - HINTS - ${_xr_openxr_sdk_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib -) - -# 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 - XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) - -IF(XR_OPENXR_SDK_FOUND) - SET(XR_OPENXR_SDK_LIBRARIES ${XR_OPENXR_SDK_LOADER_LIBRARY}) - SET(XR_OPENXR_SDK_INCLUDE_DIRS ${XR_OPENXR_SDK_INCLUDE_DIR}) -ENDIF(XR_OPENXR_SDK_FOUND) - -MARK_AS_ADVANCED( - XR_OPENXR_SDK_INCLUDE_DIR - XR_OPENXR_SDK_LOADER_LIBRARY -) diff --git a/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake new file mode 100644 index 00000000000..567a0101b4a --- /dev/null +++ b/build_files/cmake/Modules/FindXR_OpenXR_SDK.cmake @@ -0,0 +1,73 @@ +# - Find OpenXR-SDK libraries +# Find the native OpenXR-SDK includes and libraries +# +# Note that there is a distinction between the OpenXR standard and the SDK. The +# latter provides utilities to use the standard but is not part of it. Most +# importantly, it contains C headers and a loader library, which manages +# dynamic linking to OpenXR runtimes like Monado, Windows Mixed Reality or +# Oculus. See the repository for more details: +# https://github.com/KhronosGroup/OpenXR-SDK +# +# This module defines +# XR_OPENXR_SDK_INCLUDE_DIRS, where to find OpenXR-SDK headers, Set when +# XR_OPENXR_SDK_INCLUDE_DIR is found. +# XR_OPENXR_SDK_LIBRARIES, libraries to link against to use OpenXR. +# XR_OPENXR_SDK_ROOT_DIR, the base directory to search for OpenXR-SDK. +# This can also be an environment variable. +# XR_OPENXR_SDK_FOUND, if false, do not try to use OpenXR-SDK. +# +# also defined, but not for general use are +# XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library. + +#============================================================================= +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +# If XR_OPENXR_SDK_ROOT_DIR was defined in the environment, use it. +IF(NOT XR_OPENXR_SDK_ROOT_DIR AND NOT $ENV{XR_OPENXR_SDK_ROOT_DIR} STREQUAL "") + SET(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR}) +ENDIF() + +SET(_xr_openxr_sdk_SEARCH_DIRS + ${XR_OPENXR_SDK_ROOT_DIR} + /opt/lib/xr-openxr-sdk +) + +FIND_PATH(XR_OPENXR_SDK_INCLUDE_DIR + NAMES + openxr/openxr.h + HINTS + ${_xr_openxr_sdk_SEARCH_DIRS} + PATH_SUFFIXES + include +) + +FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY + NAMES + openxr_loader + HINTS + ${_xr_openxr_sdk_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib +) + +# 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 + XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR) + +IF(XR_OPENXR_SDK_FOUND) + SET(XR_OPENXR_SDK_LIBRARIES ${XR_OPENXR_SDK_LOADER_LIBRARY}) + SET(XR_OPENXR_SDK_INCLUDE_DIRS ${XR_OPENXR_SDK_INCLUDE_DIR}) +ENDIF(XR_OPENXR_SDK_FOUND) + +MARK_AS_ADVANCED( + XR_OPENXR_SDK_INCLUDE_DIR + XR_OPENXR_SDK_LOADER_LIBRARY +) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index c5c46a3b394..5949e761551 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -430,8 +430,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 b623200a159..83909a0cf66 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, @@ -428,7 +428,7 @@ if(WITH_TBB) 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) -- cgit v1.2.3