diff options
-rw-r--r-- | build_files/cmake/Modules/FindFFmpeg.cmake | 4 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOSL.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenColorIO.cmake | 8 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenImageDenoise.cmake | 1 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 1 | ||||
-rw-r--r-- | intern/cycles/blender/shader.cpp | 3 | ||||
-rw-r--r-- | source/blender/io/collada/CMakeLists.txt | 4 |
7 files changed, 18 insertions, 5 deletions
diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake index 216dd2a12b6..c7a2e51adaa 100644 --- a/build_files/cmake/Modules/FindFFmpeg.cmake +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -79,4 +79,6 @@ mark_as_advanced( unset(_ffmpeg_SEARCH_DIRS) unset(_ffmpeg_LIBRARIES) -unset(_ffmpeg_INCLUDE_DIR) +# In cmake version 3.21 and up, we can instead use the NO_CACHE option for +# find_path so we don't need to clear it from the cache here. +unset(_ffmpeg_INCLUDE_DIR CACHE) diff --git a/build_files/cmake/Modules/FindOSL.cmake b/build_files/cmake/Modules/FindOSL.cmake index 612fd9feecc..ab5de53d3c9 100644 --- a/build_files/cmake/Modules/FindOSL.cmake +++ b/build_files/cmake/Modules/FindOSL.cmake @@ -72,6 +72,7 @@ FIND_PATH(OSL_SHADER_DIR /usr/include/OSL/ PATH_SUFFIXES share/OSL/shaders + shaders ) # handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if @@ -95,6 +96,7 @@ ENDIF() MARK_AS_ADVANCED( OSL_INCLUDE_DIR + OSL_SHADER_DIR ) FOREACH(COMPONENT ${_osl_FIND_COMPONENTS}) STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index f290f8d63cd..8e152008ea7 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -83,12 +83,14 @@ ENDIF() MARK_AS_ADVANCED( OPENCOLORIO_INCLUDE_DIR OPENCOLORIO_LIBRARY - OPENCOLORIO_OPENCOLORIO_LIBRARY - OPENCOLORIO_TINYXML_LIBRARY - OPENCOLORIO_YAML-CPP_LIBRARY OPENCOLORIO_VERSION ) +FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) + STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) + MARK_AS_ADVANCED(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) +ENDFOREACH() + UNSET(COMPONENT) UNSET(UPPERCOMPONENT) UNSET(_opencolorio_FIND_COMPONENTS) diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake index becd2f0cffe..a7f03fefd24 100644 --- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake +++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake @@ -106,6 +106,7 @@ ENDIF() MARK_AS_ADVANCED( OPENIMAGEDENOISE_INCLUDE_DIR + OPENIMAGEDENOISE_LIBRARY ) FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS}) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 96c402760b7..f68878c5913 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -345,6 +345,7 @@ if(WITH_BOOST) find_package(IcuLinux) endif() mark_as_advanced(Boost_DIR) # why doesn't boost do this? + mark_as_advanced(Boost_INCLUDE_DIR) # why doesn't boost do this? endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) diff --git a/intern/cycles/blender/shader.cpp b/intern/cycles/blender/shader.cpp index 9de507966d8..9d696aaeeb2 100644 --- a/intern/cycles/blender/shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -32,7 +32,8 @@ typedef map<string, ConvertNode *> ProxyMap; void BlenderSync::find_shader(BL::ID &id, array<Node *> &used_shaders, Shader *default_shader) { - Shader *shader = (id) ? shader_map.find(id) : default_shader; + Shader *synced_shader = (id) ? shader_map.find(id) : nullptr; + Shader *shader = (synced_shader) ? synced_shader : default_shader; used_shaders.push_back_slow(shader); shader->tag_used(scene); diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 34949da622a..3289a7c6e66 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -14,6 +14,10 @@ if(OPENCOLLADA_ANIMATION_CLIP) add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP) endif() +# In cmake version 3.21 and up, we can instead use the NO_CACHE option for +# find_file so we don't need to clear it from the cache here. +unset(OPENCOLLADA_ANIMATION_CLIP CACHE) + set(INC . ../../blenkernel |