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.
This commit is contained in:
parent
4c2ce816aa
commit
be83b8f456
|
@ -51,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY
|
||||||
# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
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)
|
IF(ALEMBIC_FOUND)
|
||||||
SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
|
SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
|
||||||
|
|
|
@ -53,7 +53,7 @@ FIND_LIBRARY(BLOSC_LIBRARY
|
||||||
# handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(BLOSC DEFAULT_MSG
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Blosc DEFAULT_MSG
|
||||||
BLOSC_LIBRARY BLOSC_INCLUDE_DIR)
|
BLOSC_LIBRARY BLOSC_INCLUDE_DIR)
|
||||||
|
|
||||||
IF(BLOSC_FOUND)
|
IF(BLOSC_FOUND)
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
# EMBREE_ROOT_DIR, The base directory to search for Embree.
|
# EMBREE_ROOT_DIR, The base directory to search for Embree.
|
||||||
# This can also be an environment variable.
|
# This can also be an environment variable.
|
||||||
# EMBREEFOUND, If false, do not try to use Embree.
|
# 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.
|
# Copyright 2018 Blender Foundation.
|
||||||
|
@ -70,15 +67,6 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
|
||||||
ENDFOREACH()
|
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
|
# handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
|
|
|
@ -51,7 +51,7 @@ FIND_LIBRARY(GLEW_LIBRARY
|
||||||
# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG
|
||||||
GLEW_LIBRARY GLEW_INCLUDE_DIR)
|
GLEW_LIBRARY GLEW_INCLUDE_DIR)
|
||||||
|
|
||||||
IF(GLEW_FOUND)
|
IF(GLEW_FOUND)
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
# OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
|
# OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
|
||||||
# This can also be an environment variable.
|
# This can also be an environment variable.
|
||||||
# OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
|
# 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.
|
# Copyright 2011 Blender Foundation.
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
# OPENSUBDIV_ROOT_DIR, the base directory to search for OpenSubdiv.
|
# OPENSUBDIV_ROOT_DIR, the base directory to search for OpenSubdiv.
|
||||||
# This can also be an environment variable.
|
# This can also be an environment variable.
|
||||||
# OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv.
|
# 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.
|
# Copyright 2013 Blender Foundation.
|
||||||
|
|
|
@ -53,7 +53,7 @@ FIND_LIBRARY(OPENVDB_LIBRARY
|
||||||
# handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENVDB DEFAULT_MSG
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG
|
||||||
OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR)
|
OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR)
|
||||||
|
|
||||||
IF(OPENVDB_FOUND)
|
IF(OPENVDB_FOUND)
|
||||||
|
|
|
@ -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
|
# handle the QUIETLY and REQUIRED arguments and set XR_OPENXR_SDK_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
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)
|
XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR)
|
||||||
|
|
||||||
IF(XR_OPENXR_SDK_FOUND)
|
IF(XR_OPENXR_SDK_FOUND)
|
|
@ -430,8 +430,8 @@ if(WITH_OPENMP)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_XR_OPENXR)
|
if(WITH_XR_OPENXR)
|
||||||
find_package(OpenXR-SDK)
|
find_package(XR_OpenXR_SDK)
|
||||||
if(NOT OPENXR_SDK_FOUND)
|
if(NOT XR_OPENXR_SDK_FOUND)
|
||||||
message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR")
|
message(WARNING "OpenXR-SDK was not found, disabling WITH_XR_OPENXR")
|
||||||
set(WITH_XR_OPENXR OFF)
|
set(WITH_XR_OPENXR OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -234,10 +234,10 @@ endif()
|
||||||
|
|
||||||
if(WITH_CYCLES_OSL)
|
if(WITH_CYCLES_OSL)
|
||||||
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
|
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})
|
set(OSL_ROOT ${CYCLES_OSL})
|
||||||
endif()
|
endif()
|
||||||
find_package_wrapper(OpenShadingLanguage)
|
find_package_wrapper(OSL)
|
||||||
if(OSL_FOUND)
|
if(OSL_FOUND)
|
||||||
if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")
|
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,
|
# Note: --whole-archive is needed to force loading of all symbols in liboslexec,
|
||||||
|
@ -428,7 +428,7 @@ if(WITH_TBB)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_XR_OPENXR)
|
if(WITH_XR_OPENXR)
|
||||||
find_package(XR-OpenXR-SDK)
|
find_package(XR_OpenXR_SDK)
|
||||||
if(NOT XR_OPENXR_SDK_FOUND)
|
if(NOT XR_OPENXR_SDK_FOUND)
|
||||||
message(WARNING "OpenXR-SDK not found, disabling WITH_XR_OPENXR")
|
message(WARNING "OpenXR-SDK not found, disabling WITH_XR_OPENXR")
|
||||||
set(WITH_XR_OPENXR OFF)
|
set(WITH_XR_OPENXR OFF)
|
||||||
|
|
Loading…
Reference in New Issue