From 19d0016c5af9d6c00bc3d1414d482183babd10d7 Mon Sep 17 00:00:00 2001 From: BearOso Date: Thu, 24 Aug 2023 14:19:55 -0500 Subject: [PATCH] Gtk: Use GNUInstallDirs. --- gtk/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 01d011ee..29836d34 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -17,15 +17,15 @@ option(DANGEROUS_HACKS "Allow dangerous hacks to be used" ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_INSTALL_DATADIR "snes9x" CACHE STRING "cheats.bml directory") -set(CMAKE_INSTALL_LOCALEDIR locale CACHE STRING "Locale directory") + +include(GNUInstallDirs) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "One of: Debug Release RelWithDebInfo MinSizeRel" FORCE) endif(NOT CMAKE_BUILD_TYPE) -string(APPEND DATADIR ${CMAKE_INSTALL_PREFIX} "/" ${CMAKE_INSTALL_DATAROOTDIR} "/" ${CMAKE_INSTALL_DATADIR}) -string(APPEND LOCALEDIR ${CMAKE_INSTALL_PREFIX} "/" ${CMAKE_INSTALL_DATAROOTDIR} "/" ${CMAKE_INSTALL_LOCALEDIR}) +string(APPEND DATADIR ${CMAKE_INSTALL_PREFIX} "/" ${CMAKE_INSTALL_DATAROOTDIR} "/snes9x") +string(APPEND LOCALEDIR ${CMAKE_INSTALL_PREFIX} "/" ${CMAKE_INSTALL_DATAROOTDIR} "/locale" ) add_compile_definitions(HAVE_LIBPNG ZLIB SNES9X_GTK NETPLAY_SUPPORT @@ -406,7 +406,7 @@ if(USE_SLANG) endif() install(TARGETS snes9x-gtk) -install(FILES ../data/cheats.bml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_INSTALL_DATADIR}) +install(FILES ../data/cheats.bml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/snes9x) install(FILES data/snes9x-gtk.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) install(FILES data/snes9x_16x16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME snes9x.png) install(FILES data/snes9x_24x24.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps RENAME snes9x.png)