ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix install path of XDG desktop file with DESTDIR

This commit is contained in:
Jeffrey Pfau 2015-08-18 22:32:59 -07:00
parent 1f899737d9
commit 1f10613d1b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,6 +1,7 @@
0.4.0: (Future) 0.4.0: (Future)
Bugfixes: Bugfixes:
- Qt: Windows no longer spawn in the top left on first launch - Qt: Windows no longer spawn in the top left on first launch
- Qt: Fix install path of XDG desktop file with DESTDIR
Misc: Misc:
- Qt: Window size command line options are now supported - Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper - Qt: Increase usability of key mapper

2
src/platform/qt/CMakeLists.txt
View File

@ -167,7 +167,7 @@ install(TARGETS ${BINARY_NAME}-qt
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_program(DESKTOP_FILE_INSTALL desktop-file-install) find_program(DESKTOP_FILE_INSTALL desktop-file-install)
if(DESKTOP_FILE_INSTALL) if(DESKTOP_FILE_INSTALL)
install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/applications/\")") install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")")
endif() endif()
endif() endif()
if(UNIX) if(UNIX)