From b746179d0add695143675ba5b516618f4b294270 Mon Sep 17 00:00:00 2001 From: Ankit Meel Date: Thu, 17 Sep 2020 17:10:42 +0530 Subject: 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 --- intern/cycles/CMakeLists.txt | 2 +- intern/opensubdiv/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') 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} ) -- cgit v1.2.3