summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Mai M2021-05-26 18:19:02 -0400
committerGravatar GitHub2021-05-26 18:19:02 -0400
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.gz
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.tar.xz
yuzu-116989be8e0900a42a1e1b9226acb08808356ab6.zip
Merge pull request #6366 from lat9nq/bundled-qt-linux
cmake: Download Qt binaries on Linux if needed
Diffstat (limited to 'src')
-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)
4set(CMAKE_INCLUDE_CURRENT_DIR ON) 4set(CMAKE_INCLUDE_CURRENT_DIR ON)
5set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) 5set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
6 6
7# Set the RPATH for Qt Libraries
8# This must be done before the `yuzu` target is created
9if (YUZU_USE_BUNDLED_QT AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
10 set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/")
11endif()
12
7add_executable(yuzu 13add_executable(yuzu
8 Info.plist 14 Info.plist
9 about_dialog.cpp 15 about_dialog.cpp
@@ -278,11 +284,14 @@ if(UNIX AND NOT APPLE)
278 install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 284 install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
279endif() 285endif()
280 286
281if (MSVC) 287if (YUZU_USE_BUNDLED_QT)
282 include(CopyYuzuQt5Deps) 288 include(CopyYuzuQt5Deps)
289 copy_yuzu_Qt5_deps(yuzu)
290endif()
291
292if (MSVC)
283 include(CopyYuzuSDLDeps) 293 include(CopyYuzuSDLDeps)
284 include(CopyYuzuFFmpegDeps) 294 include(CopyYuzuFFmpegDeps)
285 copy_yuzu_Qt5_deps(yuzu)
286 copy_yuzu_SDL_deps(yuzu) 295 copy_yuzu_SDL_deps(yuzu)
287 copy_yuzu_FFmpeg_deps(yuzu) 296 copy_yuzu_FFmpeg_deps(yuzu)
288endif() 297endif()