Fix Install locations on Linux
parent
d680d3dd53
commit
8dfc9d8a6a
|
@ -141,6 +141,13 @@ if(WIN32)
|
||||||
set(INSTALL_RUNTIME_DIR ".")
|
set(INSTALL_RUNTIME_DIR ".")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
set(ICON_DIR "/usr/local/share/icons/hicolor/scalable/apps")
|
||||||
|
if(BUILD_PORTABLE)
|
||||||
|
set(ICON_DIR ".")
|
||||||
|
endif()
|
||||||
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MinetestMapperGui.in.desktop" "${CMAKE_CURRENT_BINARY_DIR}/MinetestMapperGui.desktop")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INSTALL_RUNTIME_DIR})
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INSTALL_RUNTIME_DIR})
|
||||||
include(InstallRequiredSystemLibraries)
|
include(InstallRequiredSystemLibraries)
|
||||||
|
@ -181,8 +188,12 @@ if(WIN32)
|
||||||
CONFIGURATIONS RelWithDebInfo
|
CONFIGURATIONS RelWithDebInfo
|
||||||
FILES_MATCHING PATTERN "*.dll")
|
FILES_MATCHING PATTERN "*.dll")
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/icon.svg" DESTINATION "/usr/local/share/icons/hicolor/scalable/apps" RENAME "MinetestMapperGUI.svg")
|
if(BUILD_PORTABLE)
|
||||||
install(FILES "MinetestMapperGUI.desktop" DESTINATION "/usr/share/applications")
|
# .desktop files does not support relative paths.
|
||||||
|
else()
|
||||||
|
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/icon.svg" DESTINATION "${ICON_DIR}" RENAME "${PROJECT_NAME}.svg")
|
||||||
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/MinetestMapperGui.desktop" DESTINATION "/usr/share/applications")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Type=Application
|
|
||||||
Terminal=false
|
|
||||||
Name=MinetestMapperGUI
|
|
||||||
Comment=Graphical userinterface for MinetestMapper
|
|
||||||
TryExec=MinetestMapperGUI
|
|
||||||
Exec=MinetestMapperGUI
|
|
||||||
Icon=/usr/local/share/icons/hicolor/scalable/apps/MinetestMapperGUI.svg
|
|
||||||
Categories=Utility;Application;
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Version=${PROJECT_VERSION}
|
||||||
|
Type=Application
|
||||||
|
Terminal=false
|
||||||
|
Name=${PROJECT_NAME}
|
||||||
|
Comment=${PROJECT_DESCRIPTION}
|
||||||
|
TryExec=${PROJECT_NAME}
|
||||||
|
Exec=${PROJECT_NAME}
|
||||||
|
Icon=${ICON_DIR}/${PROJECT_NAME}.svg
|
||||||
|
Categories=Utility;Application;
|
Loading…
Reference in New Issue