diff options
author | Ankit Meel <ankitjmeel@gmail.com> | 2020-09-17 14:40:42 +0300 |
---|---|---|
committer | Ankit Meel <ankitjmeel@gmail.com> | 2020-09-18 16:42:26 +0300 |
commit | b746179d0add695143675ba5b516618f4b294270 (patch) | |
tree | 47d262507b3151e19114d182e4e71eec382522f6 | |
parent | df126861b25a51baf7d5eaea732a1e61b863af83 (diff) |
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
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 | ||||
-rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index d49b576ba1a..899da59324f 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -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 diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index f420b1faf81..f9987ea8c0d 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -274,7 +274,7 @@ if(WITH_OPENSUBDIV) add_definitions(-DWITH_OPENSUBDIV) include_directories( SYSTEM - ${OPENSUBDIV_INCLUDE_DIR} + ${OPENSUBDIV_INCLUDE_DIRS} ) endif() diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index ea48a387bbd..16334a80761 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -45,7 +45,7 @@ if(WITH_OPENSUBDIV) endmacro() list(APPEND INC_SYS - ${OPENSUBDIV_INCLUDE_DIR} + ${OPENSUBDIV_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ) |