diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index 540a41f1d..e7ae25c96 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -1,85 +1,81 @@ ######################################################################### # KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwincompositing\") add_definitions(-DQT_NO_URL_CAST_FROM_STRING) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY) include_directories(${KWIN_SOURCE_DIR}/effects) ################# configure checks and create the configured files ################# -# now create config headers -configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h ) -configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h ) - set(kwincomposing_SRC model.cpp main.cpp compositing.cpp effectconfig.cpp) qt5_add_dbus_interface( kwincomposing_SRC ${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface) qt5_add_dbus_interface( kwincomposing_SRC ${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface) ki18n_wrap_ui(kwincomposing_SRC compositing.ui) add_library(kwincompositing MODULE ${kwincomposing_SRC}) target_link_libraries(kwincompositing Qt5::Quick Qt5::QuickWidgets Qt5::DBus Qt5::Widgets KF5::CoreAddons KF5::ConfigCore KF5::Declarative KF5::I18n KF5::KCMUtils KF5::NewStuff kcmkwincommon ) if (BUILD_TESTING) include(ECMMarkAsTest) set(modelTest_SRC model.cpp effectconfig.cpp compositing.cpp test/effectmodeltest.cpp test/modeltest.cpp) qt5_add_dbus_interface(modelTest_SRC ${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface) qt5_add_dbus_interface(modelTest_SRC ${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface) add_executable(effectModelTest ${modelTest_SRC}) ecm_mark_as_test(effectModelTest) target_link_libraries(effectModelTest Qt5::Quick Qt5::QuickWidgets Qt5::DBus Qt5::Test Qt5::Widgets KF5::CoreAddons KF5::ConfigCore KF5::Declarative KF5::I18n KF5::KCMUtils KF5::NewStuff kwineffects kcmkwincommon ) endif() INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing) INSTALL(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kwincompositing.desktop kcmkwineffects.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kwineffect.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) ################# list the subdirectories ################# diff --git a/kcmkwin/kwincompositing/config-compiler.h.cmake b/kcmkwin/kwincompositing/config-compiler.h.cmake deleted file mode 100644 index c389841ae..000000000 --- a/kcmkwin/kwincompositing/config-compiler.h.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -#define KDE_COMPILER_VERSION "${KDE_COMPILER_VERSION}" - -#define KDE_COMPILING_OS "${CMAKE_SYSTEM}" - -#define KDE_DISTRIBUTION_TEXT "${KDE_DISTRIBUTION_TEXT}" - diff --git a/kcmkwin/kwincompositing/config-prefix.h.cmake b/kcmkwin/kwincompositing/config-prefix.h.cmake deleted file mode 100644 index 9d15b5f6a..000000000 --- a/kcmkwin/kwincompositing/config-prefix.h.cmake +++ /dev/null @@ -1,34 +0,0 @@ -/* This file contains all the paths that change when changing the installation prefix */ - -#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" - -/* The compiled in system configuration prefix */ -#define KDESYSCONFDIR "${SYSCONF_INSTALL_DIR}" - -#define __KDE_BINDIR "${BIN_INSTALL_DIR}" - -/* Compile in the exec prefix to help kstddirs in finding dynamic libs - (This was for exec_prefix != prefix - still needed?) */ -#define __KDE_EXECPREFIX "NONE" - -#define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" -#define DATA_INSTALL_DIR "${DATA_INSTALL_DIR}" -#define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}" -#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}" -#define BIN_INSTALL_DIR "${BIN_INSTALL_DIR}" -#define CONFIG_INSTALL_DIR "${CONFIG_INSTALL_DIR}" -#define HTML_INSTALL_DIR "${HTML_INSTALL_DIR}" -#define ICON_INSTALL_DIR "${ICON_INSTALL_DIR}" -#define KCFG_INSTALL_DIR "${KCFG_INSTALL_DIR}" -#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" -#define SERVICES_INSTALL_DIR "${SERVICES_INSTALL_DIR}" -#define SERVICETYPES_INSTALL_DIR "${SERVICETYPES_INSTALL_DIR}" -#define SOUND_INSTALL_DIR "${SOUND_INSTALL_DIR}" -#define TEMPLATES_INSTALL_DIR "${TEMPLATES_INSTALL_DIR}" -#define WALLPAPER_INSTALL_DIR "${WALLPAPER_INSTALL_DIR}" -#define XDG_APPS_INSTALL_DIR "${XDG_APPS_INSTALL_DIR}" -#define XDG_DIRECTORY_INSTALL_DIR "${XDG_DIRECTORY_INSTALL_DIR}" -#define EXEC_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}" -#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}" -#define LOCALE_INSTALL_DIR "${LOCALE_INSTALL_DIR}" -#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}"