From cded82a00baf3aa20839e5f019903d93a36f7d19 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 14 Nov 2023 00:02:50 +0100 Subject: [PATCH] Move use of `KDE_INSTALL_DIR` from `debug-kde` into new preset `debug-kde-custom` --- CMakePresets.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index e752369..2412fc1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -104,16 +104,25 @@ { "name": "debug-kde", "inherits": "debug-qt6", - "displayName": "Generic debug build with development config using custom KDE build", - "description": "Same as devel but creates a debug build", + "displayName": "Generic debug build with development config with KDE integrations enabled", + "description": "Same as debug-qt6 but with KDE integrations enabled", "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/debug-kde", "cacheVariables": { - "CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"}, - "CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"}, "NO_PLASMOID": {"type": "BOOL", "value": "OFF"}, "NO_FILE_ITEM_ACTION_PLUGIN": {"type": "BOOL", "value": "OFF"} } }, + { + "name": "debug-kde-custom", + "inherits": "debug-kde", + "displayName": "Generic debug build with development config using custom KDE build", + "description": "Same as debug-kde but with custom KDE installation from KDE_INSTALL_DIR", + "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/debug-kde-custom", + "cacheVariables": { + "CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"}, + "CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"} + } + }, { "name": "arch-x86_64-w64-mingw32", "inherits": ["no-webview", "no-kde"], @@ -287,6 +296,7 @@ {"name": "debug", "configurePreset": "debug"}, {"name": "debug-qt6", "configurePreset": "debug-qt6"}, {"name": "debug-kde", "configurePreset": "debug-kde"}, + {"name": "debug-kde-custom", "configurePreset": "debug-kde-custom"}, {"name": "arch-x86_64-w64-mingw32", "configurePreset": "arch-x86_64-w64-mingw32"}, {"name": "arch-x86_64-w64-mingw32-static", "configurePreset": "arch-x86_64-w64-mingw32-static"}, {"name": "arch-x86_64-w64-mingw32-qt6", "configurePreset": "arch-x86_64-w64-mingw32-qt6"},