diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-11 05:15:52 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-11 05:15:52 +0000 |
| commit | f9249ab577944072ec79882799a165fcb70551dd (patch) | |
| tree | ddca10f9b62fad1954e39529f7bb0a0afb6082d5 | |
| parent | Few final updates to mesh shader implementation (diff) | |
| download | DiligentCore-f9249ab577944072ec79882799a165fcb70551dd.tar.gz DiligentCore-f9249ab577944072ec79882799a165fcb70551dd.zip | |
CMake: updated copy_required_dlls to take D3Dcompiler_47.dll from Win SDK
| -rw-r--r-- | BuildUtils.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/BuildUtils.cmake b/BuildUtils.cmake index 71132563..724a5ad1 100644 --- a/BuildUtils.cmake +++ b/BuildUtils.cmake @@ -27,14 +27,15 @@ if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) # Copy D3Dcompiler_47.dll and dxcompiler.dll if(MSVC) if (${CMAKE_SIZEOF_VOID_P} EQUAL 8) - set(D3D_COMPILER_PATH "\"$(VC_ExecutablePath_x64_x64)\\D3Dcompiler_47.dll\"") - set(DXC_COMPILER_PATH "\"$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x64\\dxcompiler.dll\"") - set(DXIL_SIGNER_PATH "\"$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x64\\dxil.dll\"") + set(WIN_SDK_BIN_PATH "$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x64") else() - set(D3D_COMPILER_PATH "\"$(VC_ExecutablePath_x86_x86)\\D3Dcompiler_47.dll\"") - set(DXC_COMPILER_PATH "\"$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x86\\dxcompiler.dll\"") - set(DXIL_SIGNER_PATH "\"$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x86\\dxil.dll\"") + set(WIN_SDK_BIN_PATH "$(WindowsSdkDir)\\bin\\${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}\\x86") endif() + + set(D3D_COMPILER_PATH "\"${WIN_SDK_BIN_PATH}\\D3Dcompiler_47.dll\"") + set(DXC_COMPILER_PATH "\"${WIN_SDK_BIN_PATH}\\dxcompiler.dll\"") + set(DXIL_SIGNER_PATH "\"${WIN_SDK_BIN_PATH}\\dxil.dll\"") + add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${D3D_COMPILER_PATH} |