diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-05-19 23:18:33 +0200 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-05-26 21:29:45 +0200 |
| commit | 52cc25ccbf5faf3ae0ee33e9e28e998440f5c424 (patch) | |
| tree | c390fd461611f32a69274fbb53f45da4d18fa697 /src | |
| parent | Merge pull request #6339 from Morph1984/swkbd-queuedconnection (diff) | |
| download | yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar.gz yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar.bz2 yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar.lz yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar.xz yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.tar.zst yuzu-52cc25ccbf5faf3ae0ee33e9e28e998440f5c424.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index cc0790e07..634fe66a5 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -4,6 +4,12 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) +# Set the RPATH for Qt Libraries +# This must be done before the `yuzu` target is created +if (YUZU_USE_BUNDLED_QT AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) + set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/") +endif() + add_executable(yuzu Info.plist about_dialog.cpp @@ -278,11 +284,14 @@ if(UNIX AND NOT APPLE) install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -if (MSVC) +if (YUZU_USE_BUNDLED_QT) include(CopyYuzuQt5Deps) + copy_yuzu_Qt5_deps(yuzu) +endif() + +if (MSVC) include(CopyYuzuSDLDeps) include(CopyYuzuFFmpegDeps) - copy_yuzu_Qt5_deps(yuzu) copy_yuzu_SDL_deps(yuzu) copy_yuzu_FFmpeg_deps(yuzu) endif() |