From b8beba80066a3397b7ffc0405c68a2d0db80cbbc Mon Sep 17 00:00:00 2001 From: Cosima Neidahl Date: Sun, 25 Feb 2024 16:27:29 +0100 Subject: [PATCH] Use GNUInstallDirs for install locations (#39) --- CMakeLists.txt | 9 ++++++--- ...m-non-snap.desktop => miracle-wm-non-snap.desktop.in} | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) rename session/usr/local/share/wayland-sessions/{miracle-wm-non-snap.desktop => miracle-wm-non-snap.desktop.in} (67%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4f729a..42deef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,8 @@ pkg_check_modules(YAML REQUIRED IMPORTED_TARGET yaml-cpp) pkg_check_modules(LIBEVDEV REQUIRED IMPORTED_TARGET libevdev) find_package(nlohmann_json 3.2.0 REQUIRED) +include(GNUInstallDirs) + add_executable(miracle-wm src/main.cpp src/miracle_window_management_policy.cpp @@ -41,10 +43,11 @@ target_include_directories(miracle-wm PUBLIC SYSTEM ${MIRAL_INCLUDE_DIRS}) target_link_libraries( miracle-wm ${MIRAL_LDFLAGS} PkgConfig::YAML PkgConfig::GLIB PkgConfig::LIBEVDEV nlohmann_json::nlohmann_json) install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/miracle-wm - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + DESTINATION ${CMAKE_INSTALL_BINDIR} ) -install(FILES session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop - DESTINATION /usr/share/wayland-sessions) +configure_file(session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop.in miracle-wm-non-snap.desktop @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wm-non-snap.desktop + DESTINATION ${CMAKE_INSTALL_DATADIR}/wayland-sessions) add_subdirectory(tests/) diff --git a/session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop b/session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop.in similarity index 67% rename from session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop rename to session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop.in index 6159b9f..82ec8a5 100644 --- a/session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop +++ b/session/usr/local/share/wayland-sessions/miracle-wm-non-snap.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] Name=Miracle Non Snap Comment=A wayland tiling window manager based on Mir -Exec=sh -l -c /usr/local/bin/miracle-wm +Exec=sh -l -c @CMAKE_INSTALL_FULL_BINDIR@/miracle-wm Type=Application