From 1755951fd3b344188a91e1d28911d6a6124cf121 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 24 Mar 2022 18:30:54 +0200 Subject: [PATCH] redshift-plasmoid: build fix Signed-off-by: Ivailo Monev --- redshift-plasmoid/icons/CMakeLists.txt | 3 +-- redshift-plasmoid/po/CMakeLists.txt | 2 +- redshift-plasmoid/src/CMakeLists.txt | 2 +- redshift-plasmoid/src/applet/CMakeLists.txt | 6 +++--- redshift-plasmoid/src/dataengine/CMakeLists.txt | 6 +++--- .../src/redshiftAutostartEnabler/CMakeLists.txt | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/redshift-plasmoid/icons/CMakeLists.txt b/redshift-plasmoid/icons/CMakeLists.txt index 33168c7b..64266d49 100644 --- a/redshift-plasmoid/icons/CMakeLists.txt +++ b/redshift-plasmoid/icons/CMakeLists.txt @@ -1,2 +1 @@ -kde4_install_icons(${ICON_INSTALL_DIR}) -kde4_update_iconcache() +kde4_install_icons(${KDE4_ICON_INSTALL_DIR}) diff --git a/redshift-plasmoid/po/CMakeLists.txt b/redshift-plasmoid/po/CMakeLists.txt index 2d9de139..bfee8b60 100644 --- a/redshift-plasmoid/po/CMakeLists.txt +++ b/redshift-plasmoid/po/CMakeLists.txt @@ -25,7 +25,7 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE) ADD_CUSTOM_COMMAND(TARGET translations COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile} DEPENDS ${_poFile}) - INSTALL(FILES ${_gmoFile} DESTINATION ${LOCALE_INSTALL_DIR}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) + INSTALL(FILES ${_gmoFile} DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) ENDIF( _langCode ) ENDFOREACH(_poFile ${PO_FILES}) diff --git a/redshift-plasmoid/src/CMakeLists.txt b/redshift-plasmoid/src/CMakeLists.txt index 45a7fae0..0e4db912 100644 --- a/redshift-plasmoid/src/CMakeLists.txt +++ b/redshift-plasmoid/src/CMakeLists.txt @@ -2,4 +2,4 @@ add_subdirectory(dataengine) add_subdirectory(applet) add_subdirectory(redshiftAutostartEnabler) -install(FILES redshift.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES redshift.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR}) diff --git a/redshift-plasmoid/src/applet/CMakeLists.txt b/redshift-plasmoid/src/applet/CMakeLists.txt index 5e802725..dce7bb75 100644 --- a/redshift-plasmoid/src/applet/CMakeLists.txt +++ b/redshift-plasmoid/src/applet/CMakeLists.txt @@ -1,13 +1,13 @@ set(redshiftapplet_SRCS redshiftapplet.cpp redshiftosdwidget.cpp + redshift.ui ) -kde4_add_ui_files(redshiftapplet_SRCS redshift.ui) kde4_add_kcfg_files(redshiftapplet_SRCS ../redshiftsettings.kcfgc) kde4_add_plugin(plasma_applet_redshift ${redshiftapplet_SRCS}) target_link_libraries(plasma_applet_redshift ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_applet_redshift DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-applet-redshift.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS plasma_applet_redshift DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-applet-redshift.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) diff --git a/redshift-plasmoid/src/dataengine/CMakeLists.txt b/redshift-plasmoid/src/dataengine/CMakeLists.txt index bbccbb79..8da8a458 100644 --- a/redshift-plasmoid/src/dataengine/CMakeLists.txt +++ b/redshift-plasmoid/src/dataengine/CMakeLists.txt @@ -11,7 +11,7 @@ kde4_add_plugin(plasma_engine_redshift ${redshift_engine_SRCS}) target_link_libraries(plasma_engine_redshift ${KDE4_PLASMA_LIBS}) -install(TARGETS plasma_engine_redshift DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-dataengine-redshift.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES redshift.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +install(TARGETS plasma_engine_redshift DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) +install(FILES plasma-dataengine-redshift.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install(FILES redshift.operations DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services) diff --git a/redshift-plasmoid/src/redshiftAutostartEnabler/CMakeLists.txt b/redshift-plasmoid/src/redshiftAutostartEnabler/CMakeLists.txt index 9918783a..aed24bc4 100644 --- a/redshift-plasmoid/src/redshiftAutostartEnabler/CMakeLists.txt +++ b/redshift-plasmoid/src/redshiftAutostartEnabler/CMakeLists.txt @@ -3,9 +3,9 @@ set(redshiftautostart_SRCS redshiftenabler.cpp ) -kde4_add_executable(redshiftautostart ${redshiftautostart_SRCS}) +add_executable(redshiftautostart ${redshiftautostart_SRCS}) target_link_libraries(redshiftautostart ${KDE4_KDECORE_LIBS} ) -install(TARGETS redshiftautostart DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS redshiftautostart DESTINATION ${KDE4_BIN_INSTALL_DIR}) install(FILES RedshiftAutostart.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/autostart)