diff options
| author | 2023-05-28 13:18:06 -0400 | |
|---|---|---|
| committer | 2023-05-28 13:18:06 -0400 | |
| commit | 379d4b5e6a210ea5065543845a45655bd104596b (patch) | |
| tree | 2281a214ece00269b0c9a29f12e7a0aeb6112e21 /src | |
| 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 'src')
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 2d7b9ab65..84d9ca796 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -378,11 +378,7 @@ if(UNIX AND NOT APPLE) | |||
| 378 | endif() | 378 | endif() |
| 379 | 379 | ||
| 380 | if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) | 380 | if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) |
| 381 | if (MSVC AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") | 381 | set(YUZU_EXE_DIR "$<TARGET_FILE_DIR:yuzu>") |
| 382 | set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin/$<CONFIG>") | ||
| 383 | else() | ||
| 384 | set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin") | ||
| 385 | endif() | ||
| 386 | add_custom_command(TARGET yuzu POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${YUZU_EXE_DIR}/yuzu.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) | 382 | add_custom_command(TARGET yuzu POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${YUZU_EXE_DIR}/yuzu.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) |
| 387 | endif() | 383 | endif() |
| 388 | 384 | ||