CMake/OpenSubdiv: Rename INCLUDE_DIR -> INCLUDE_DIRS.

Ref {D8855}

Unix and Apple platform files use find_package(OpenSubdiv) which sets
`OPENSUBDIV_INCLUDE_DIR` as an advanced variable, as well as
`OPENSUBDIV_INCLUDE_DIRS` which should be used usually.
Windows sets `OPENSUBDIV_INCLUDE_DIR` which is used by the rest
of the code.

This patch renames it to `_DIRS` everywhere, for it to be like other
similar variables.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D8917
This commit is contained in:
Ankit Meel 2020-09-17 17:10:42 +05:30
parent df126861b2
commit b746179d0a
3 changed files with 3 additions and 3 deletions

View File

@ -565,7 +565,7 @@ if(WITH_IMAGE_OPENJPEG)
endif()
if(WITH_OPENSUBDIV)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_INCLUDE_DIRS ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
set(OPENSUBDIV_LIBRARIES
optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib

View File

@ -274,7 +274,7 @@ if(WITH_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
include_directories(
SYSTEM
${OPENSUBDIV_INCLUDE_DIR}
${OPENSUBDIV_INCLUDE_DIRS}
)
endif()

View File

@ -45,7 +45,7 @@ if(WITH_OPENSUBDIV)
endmacro()
list(APPEND INC_SYS
${OPENSUBDIV_INCLUDE_DIR}
${OPENSUBDIV_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
)