[Bf-blender-cvs] [1c33d1813df] tmp-vfx-platform-2023: deps/win: support building against older lib folder

[Ray Molenkamp]

Commit: 1c33d1813dfd48b7553ada45065043cf8dcb82bd
Author: Ray Molenkamp
Date:   Mon Nov 21 12:58:26 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB1c33d1813dfd48b7553ada45065043cf8dcb82bd

deps/win: support building against older lib folder

We try to support both 3.4 and 3.5 lib folders to make
bisecting a little easier. Disable materialX if it is
not found in the windows library folder. Linux already
does this.

===================================================================

M	build_files/cmake/platform/platform_win32.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 6cbc7656165..1cab2ee70ad 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -285,6 +285,11 @@ if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND WITH_CLANG_TIDY)
   set(VS_CLANG_TIDY ON)
 endif()
 
+# To support building against both 3.4 and 3.5 lib folders, disable materialX if it is not found
+set(MATERIALX_LIB_FOLDER_EXISTS EXISTS ${LIBDIR}/materialx)
+set_and_warn_library_found("MaterialX" MATERIALX_LIB_FOLDER_EXISTS WITH_MATERIALX)
+unset(MATERIALX_LIB_FOLDER_EXISTS)
+
 # Mark libdir as system headers with a lower warn level, to resolve some warnings
 # that we have very little control over
 if(NOT MSVC_CLANG                  AND # Available with MSVC 15.7+ but not for CLANG.