diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-17 20:44:18 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-17 20:44:18 +0300 |
commit | b6fe1b0c658f5068154f9e4a726de789f5ebb68a (patch) | |
tree | 6cd2450b64a4310488137fb093840e28723d2667 /build_files/cmake | |
parent | 8355ac97b4327acde8b656e38e5f4911918ef521 (diff) | |
parent | a04300c436d77bf47b94d033c1d832d86425945c (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'build_files/cmake')
-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 |
5 files changed, 12 insertions, 4 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}) |