griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/blender-v4.2-release'

Browse Source
This commit is contained in:
Ray Molenkamp
2024-06-10 09:18:06 -06:00
parent 1abb633698 28f7a467fa
commit d49dc4c104
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/creator/CMakeLists.txt
View File

@@ -1001,25 +1001,13 @@ elseif(WIN32)
ALL
)
endif()
# 4.1 fftw libs need to be installed, in 4.2 fftw got turned into a static lib
# and the files below no longer exist.
if(EXISTS ${LIBDIR}/fftw3/lib/fftw3.dll)
set(FFTW_DLL ${LIBDIR}/fftw3/lib/fftw3.dll)
else()
set(FFTW_DLL ${LIBDIR}/fftw3/lib/libfftw3-3.dll)
endif()
windows_install_shared_manifest(
FILES ${FFTW_DLL}
ALL
)
if(EXISTS ${LIBDIR}/fftw3/lib/fftw3f-3.dll)
windows_install_shared_manifest(
FILES ${LIBDIR}/fftw3/lib/fftw3f-3.dll
ALL
)
elseif(EXISTS ${LIBDIR}/fftw3/lib/fftw3f.dll)
windows_install_shared_manifest(
FILES ${LIBDIR}/fftw3/lib/fftw3f.dll
FILES
${LIBDIR}/fftw3/lib/fftw3.dll
${LIBDIR}/fftw3/lib/fftw3f.dll
ALL
)
endif()