diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-04 22:35:15 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-04 22:35:15 +0300 |
| commit | d2fa7813d1414a7ce34d141150ad672870dc8a22 (patch) | |
| tree | 727a32d6c36cfca88bf75108dbdd963e85726077 /build_files | |
| parent | 30c14dd783db30b2da866936b345281aedd4a030 (diff) | |
cmake/win: fix failing tests on windows
idiff/abcls rely on the release mode dlls not available in the
blender.shared folder.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index fcac966cd86..e66824da76d 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -1012,6 +1012,8 @@ endif() # Environment variables to run precompiled executables that needed libraries. list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths) -set(PLATFORM_ENV_BUILD "PATH=${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}") -set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}") +set(PLATFORM_ENV_BUILD_DIRS "${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}") +set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}") +# Install needs the additional folders from PLATFORM_ENV_BUILD_DIRS as well, as tools like idiff and abcls use the release mode dlls +set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/\;${PLATFORM_ENV_BUILD_DIRS}\;$ENV{PATH}") unset(_library_paths) |