diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2015-07-12 03:25:53 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2015-07-12 03:25:53 +0200 |
| commit | e110e656b95c6f7386e3fd1ed086c82ea550ca7c (patch) | |
| tree | 806cad41d1bb178fbb531e53789f45fab5b55b28 /src | |
| parent | ae7120f5d925da39aea9b66750c148428eca1298 (diff) | |
| parent | 7c51bc44aabc4be0fbc26761637b56d6bf35da55 (diff) | |
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.txt | 4 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 4 |
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) target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) target_link_libraries(citra ${PLATFORM_LIBRARIES}) -#install(TARGETS citra RUNTIME DESTINATION ${bindir}) +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") + install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") +endif() 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) target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) -#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") + install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") +endif() if (Qt5_FOUND AND MSVC) set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") |