summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Danila Malyutin2023-05-13 23:58:17 +0400
committerGravatar Danila Malyutin2023-05-13 23:58:17 +0400
commitc9c5d140b84685a03dc59b930cebb802b4c14892 (patch)
tree31e2d09ad8dee463e7df8e4ca05ae486f347bfd4 /src
parentMerge pull request #10244 from liamwhite/lower-upper (diff)
downloadyuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.gz
yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.tar.xz
yuzu-c9c5d140b84685a03dc59b930cebb802b4c14892.zip
Use TARGET_FILE_DIR generator expression
Use $<TARGET_FILE_DIR:...> where appropriate instead of trying to guess where the binary will end up.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/CMakeLists.txt6
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)
378endif() 378endif()
379 379
380if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) 380if (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)
387endif() 383endif()
388 384