summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-05-27 00:19:02 +0200
committerGitHub <noreply@github.com>2021-05-27 00:19:02 +0200
commit116989be8e0900a42a1e1b9226acb08808356ab6 (patch)
tree4664d98812bd6e23d5310463eb9ba3da50888a13 /src
parentMerge pull request #6365 from degasus/drop_ChangeProcessorID (diff)
parentcmake: Download Qt binaries on Linux if needed (diff)
downloadyuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.gz
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.bz2
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.lz
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.xz
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.zst
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.zip
Diffstat (limited to '')
-rw-r--r--src/yuzu/CMakeLists.txt13
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()