diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-05-28 13:18:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-28 13:18:06 -0400 |
| commit | 379d4b5e6a210ea5065543845a45655bd104596b (patch) | |
| tree | 2281a214ece00269b0c9a29f12e7a0aeb6112e21 /src | |
| parent | bf3f4502114fb8f05531608b519d3c4e83a1e9a2 (diff) | |
| parent | 7325fb054dda17fb56f4485806af3fa06a16c9a5 (diff) | |
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) endif() if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) - if (MSVC AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") - set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin/$<CONFIG>") - else() - set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin") - endif() + set(YUZU_EXE_DIR "$<TARGET_FILE_DIR:yuzu>") 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) endif() |