citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #910 from linkmauve/install 

Tell CMake to install the compiled binaries on Linux.
This commit is contained in:
Tony Wasserka 2015-07-12 03:25:53 +02:00
parent ae7120f5d9 7c51bc44aa
commit e110e656b9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra/CMakeLists.txt
View File

@ -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 ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih)
target_link_libraries(citra ${PLATFORM_LIBRARIES}) 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()

4
src/citra_qt/CMakeLists.txt
View File

@ -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 ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) 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) if (Qt5_FOUND AND MSVC)
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")