[Bf-blender-cvs] [2d603ab4631] tmp-vfx-platform-2023: Fix: merge mistake in previous commit
Ray Molenkamp
noreply at git.blender.org
Wed Oct 5 19:19:57 CEST 2022
Commit: 2d603ab46318a178fbbbca7ab26052d9c1ab720a
Author: Ray Molenkamp
Date: Wed Oct 5 11:19:46 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB2d603ab46318a178fbbbca7ab26052d9c1ab720a
Fix: merge mistake in previous commit
blender_include_dirs has been renamed
to absolute_include_dirs.
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index ed3e1f3b122..2497fd8cc16 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1428,8 +1428,9 @@ blender_target_include_dirs(blender ${INC})
# These files are required at runtime.
if(WITH_USD)
add_definitions(-DWITH_USD)
- blender_include_dirs(../blender/io/usd)
- # On windows the usd library site in ./blender.shared copy the files
+ absolute_include_dirs(../blender/io/usd)
+
+ # On windows the usd library sits in ./blender.shared copy the files
# relative to the location of the USD dll, if the dll does not exist
# assume we are linking against the static 3.4 lib.
if(WIN32 AND EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll)
More information about the Bf-blender-cvs
mailing list