summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-07-12 03:25:53 +0200
committerGravatar Tony Wasserka2015-07-12 03:25:53 +0200
commite110e656b95c6f7386e3fd1ed086c82ea550ca7c (patch)
tree806cad41d1bb178fbb531e53789f45fab5b55b28 /src
parentMerge pull request #907 from Lectem/clamp_to_border (diff)
parentCitra, CitraQt: Tell cmake to install the compiled binaries. (diff)
downloadyuzu-e110e656b95c6f7386e3fd1ed086c82ea550ca7c.tar.gz
yuzu-e110e656b95c6f7386e3fd1ed086c82ea550ca7c.tar.xz
yuzu-e110e656b95c6f7386e3fd1ed086c82ea550ca7c.zip
Merge pull request #910 from linkmauve/install
Tell CMake to install the compiled binaries on Linux.
Diffstat (limited to 'src')
-rw-r--r--src/citra/CMakeLists.txt4
-rw-r--r--src/citra_qt/CMakeLists.txt4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 713f49193..5e8cbfa35 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -18,4 +18,6 @@ target_link_libraries(citra core common video_core)
18target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) 18target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih)
19target_link_libraries(citra ${PLATFORM_LIBRARIES}) 19target_link_libraries(citra ${PLATFORM_LIBRARIES})
20 20
21#install(TARGETS citra RUNTIME DESTINATION ${bindir}) 21if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD")
22 install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
23endif()
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index c2d1ad240..d4c0cecc3 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -73,7 +73,9 @@ target_link_libraries(citra-qt core common video_core qhexedit)
73target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) 73target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
74target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) 74target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})
75 75
76#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) 76if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD")
77 install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
78endif()
77 79
78if (Qt5_FOUND AND MSVC) 80if (Qt5_FOUND AND MSVC)
79 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") 81 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")