diff options
| author | Danila Malyutin <d.maljutin@yandex.ru> | 2023-05-13 21:58:17 +0200 |
|---|---|---|
| committer | Danila Malyutin <d.maljutin@yandex.ru> | 2023-05-13 21:58:17 +0200 |
| commit | c9c5d140b84685a03dc59b930cebb802b4c14892 (patch) | |
| tree | 31e2d09ad8dee463e7df8e4ca05ae486f347bfd4 /CMakeModules | |
| parent | Merge pull request #10244 from liamwhite/lower-upper (diff) | |
| download | yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.gz yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.bz2 yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.lz yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.xz yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.zst yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.zip | |
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuSDLDeps.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index c6231737e..7aaa073ee 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake @@ -3,7 +3,7 @@ function(copy_yuzu_FFmpeg_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index ab56de444..b3a65c347 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -4,7 +4,7 @@ function(copy_yuzu_Qt5_deps target_dir) include(WindowsCopyFiles) if (MSVC) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") else() set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake index 7ffdd8a1d..464eed5e9 100644 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ b/CMakeModules/CopyYuzuSDLDeps.cmake @@ -3,6 +3,6 @@ function(copy_yuzu_SDL_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) endfunction(copy_yuzu_SDL_deps) |