diff options
| author | 2023-05-28 13:18:06 -0400 | |
|---|---|---|
| committer | 2023-05-28 13:18:06 -0400 | |
| commit | 379d4b5e6a210ea5065543845a45655bd104596b (patch) | |
| tree | 2281a214ece00269b0c9a29f12e7a0aeb6112e21 /CMakeModules | |
| parent | Merge pull request #10283 from danilaml/support-interlaced-videos (diff) | |
| parent | Fixup upload.ps1 for GHA (diff) | |
| download | yuzu-379d4b5e6a210ea5065543845a45655bd104596b.tar.gz yuzu-379d4b5e6a210ea5065543845a45655bd104596b.tar.xz yuzu-379d4b5e6a210ea5065543845a45655bd104596b.zip | |
Merge pull request #10280 from danilaml/cmake-bin-dir
Use TARGET_FILE_DIR generator expression
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 @@ | |||
| 3 | 3 | ||
| 4 | function(copy_yuzu_FFmpeg_deps target_dir) | 4 | function(copy_yuzu_FFmpeg_deps target_dir) |
| 5 | include(WindowsCopyFiles) | 5 | include(WindowsCopyFiles) |
| 6 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 6 | set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") |
| 7 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) | 7 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) |
| 8 | string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) | 8 | string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) |
| 9 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) | 9 | 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 @@ | |||
| 4 | function(copy_yuzu_Qt5_deps target_dir) | 4 | function(copy_yuzu_Qt5_deps target_dir) |
| 5 | include(WindowsCopyFiles) | 5 | include(WindowsCopyFiles) |
| 6 | if (MSVC) | 6 | if (MSVC) |
| 7 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 7 | set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") |
| 8 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | 8 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") |
| 9 | else() | 9 | else() |
| 10 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") | 10 | 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 @@ | |||
| 3 | 3 | ||
| 4 | function(copy_yuzu_SDL_deps target_dir) | 4 | function(copy_yuzu_SDL_deps target_dir) |
| 5 | include(WindowsCopyFiles) | 5 | include(WindowsCopyFiles) |
| 6 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 6 | set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") |
| 7 | windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) | 7 | windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) |
| 8 | endfunction(copy_yuzu_SDL_deps) | 8 | endfunction(copy_yuzu_SDL_deps) |