mirror of
https://github.com/KDE/konsole.git
synced 2025-12-23 23:38:08 -05:00
76f879cd70
QT can't be made to draw monospaced text (if the font does not cooperate), so avoid combining characters, using a QPainter::drawText() call for each character. For bidi text support this change requires konsole to reorder and reshape the characters. This is done using the ICU library (which QT also uses). This change allows for some improvements related to text rendering: - More precise bidi reordering, which is no longer changed by characters' attributes and selection. - underlines drawn separately from the text, allowing for differing underline modes (double, curly, dashed, dotted, colored). - Overriding font for emoji characters. This commit fixes a few bugs and addresses a lot more: Feature requests: More standard conforming RTL and various underlines: BUG: 403729 BUG: 387811 Using non-monospace font: BUG: 416508 BUG: 452087 BUG: 425973 BUG: 430822 BUG: 442742 BUG: 441037 BUG: 430822 Emoji: BUG: 440070 CCBUG: 450017 CCBUG: 445846 CCBUG: 453086 Regression: devanagari rendering CCBUG: 381593 CCBUG: 451716
175 lines
4.6 KiB
CMake
175 lines
4.6 KiB
CMake
# Konsole project
|
|
|
|
# KDE Application Version, managed by release script
|
|
set (RELEASE_SERVICE_VERSION_MAJOR "22")
|
|
set (RELEASE_SERVICE_VERSION_MINOR "11")
|
|
set (RELEASE_SERVICE_VERSION_MICRO "70")
|
|
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
|
|
|
|
# Do not increase these requirements without a merge-request or/and
|
|
# approval from maintainer(s).
|
|
# minimal requirements
|
|
|
|
# See comments in https://invent.kde.org/utilities/konsole/-/commit/9d8e47298c81fc1e47c998eda1b6e980589274eb
|
|
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
|
|
|
|
# Match KDE Frameworks update Apr 2021
|
|
set (QT_MIN_VERSION "5.15.0")
|
|
|
|
set (KF5_MIN_VERSION "5.71.0")
|
|
|
|
# Release script will create bugzilla versions
|
|
project(konsole VERSION ${RELEASE_SERVICE_VERSION})
|
|
|
|
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
|
|
|
|
include(KDEInstallDirs)
|
|
include(KDECMakeSettings)
|
|
include(KDECompilerSettings NO_POLICY_SCOPE)
|
|
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
|
|
include(ECMOptionalAddSubdirectory)
|
|
include(ECMInstallIcons)
|
|
include(ECMSetupVersion)
|
|
include(ECMMarkNonGuiExecutable)
|
|
include(ECMGenerateHeaders)
|
|
include(GenerateExportHeader)
|
|
include(FeatureSummary)
|
|
include(ECMQtDeclareLoggingCategory)
|
|
include(KDEClangFormat)
|
|
# Remove OPTIONAL when we require EMC >= 5.79
|
|
include(KDEGitCommitHooks OPTIONAL)
|
|
include(CheckFunctionExists)
|
|
include(CheckIncludeFiles)
|
|
|
|
# Allows passing e.g. -DECM_ENABLE_SANITIZERS='address;undefined' to cmake.
|
|
include(ECMEnableSanitizers)
|
|
|
|
if(ECM_GLOBAL_FIND_VERSION VERSION_LESS "5.82.0")
|
|
if(NOT QT_MAJOR_VERSION)
|
|
set(QT_MAJOR_VERSION "5")
|
|
endif()
|
|
endif()
|
|
|
|
if(QT_MAJOR_VERSION EQUAL "6")
|
|
# ECMDeprecationSettings is in ECM since 5.91, this assumes if you're building
|
|
# with Qt6, you have latest ECM anyway
|
|
include(ECMDeprecationSettings)
|
|
ecm_set_disabled_deprecation_versions(
|
|
QT 5.15.2
|
|
KF 5.93.0
|
|
)
|
|
endif()
|
|
|
|
ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE
|
|
SOVERSION 1
|
|
)
|
|
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
|
|
Core
|
|
DBus
|
|
PrintSupport
|
|
Widgets
|
|
)
|
|
|
|
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
|
|
Bookmarks
|
|
Config
|
|
ConfigWidgets
|
|
CoreAddons
|
|
Crash
|
|
GlobalAccel
|
|
GuiAddons
|
|
DBusAddons
|
|
I18n
|
|
IconThemes
|
|
KIO
|
|
NewStuff
|
|
NewStuffCore
|
|
Notifications
|
|
NotifyConfig
|
|
Parts
|
|
Pty
|
|
Service
|
|
TextWidgets
|
|
WidgetsAddons
|
|
WindowSystem
|
|
XmlGui
|
|
)
|
|
|
|
find_package(KF5DocTools ${KF5_MIN_VERSION})
|
|
set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
|
|
"Tools to generate documentation"
|
|
TYPE OPTIONAL
|
|
)
|
|
|
|
find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
|
|
|
|
if(NOT APPLE)
|
|
option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
|
|
if (NOT WITHOUT_X11)
|
|
find_package(X11)
|
|
set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
|
|
set(HAVE_X11 ${X11_FOUND})
|
|
endif()
|
|
endif()
|
|
|
|
# Check for function GETPWUID
|
|
check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
|
|
|
|
check_function_exists(malloc_trim HAVE_MALLOC_TRIM)
|
|
|
|
# See above includes for defaults
|
|
add_definitions(
|
|
-DQT_NO_FOREACH
|
|
-DQT_STRICT_ITERATORS
|
|
-DQT_NO_URL_CAST_FROM_STRING
|
|
)
|
|
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
|
|
|
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
|
|
|
|
file(GLOB ICONS_SRCS "data/icons/*.png")
|
|
|
|
option(ENABLE_PLUGIN_SSHMANAGER "Build the SSHManager plugin" ON)
|
|
option(ENABLE_PLUGIN_QUICKCOMMANDS "Build the Quick Commands plugin" ON)
|
|
|
|
add_subdirectory( src )
|
|
add_subdirectory( data )
|
|
add_subdirectory( desktop )
|
|
add_subdirectory( kconf_update )
|
|
if (KF5DocTools_FOUND)
|
|
add_subdirectory( doc/manual )
|
|
endif()
|
|
|
|
add_subdirectory( tools )
|
|
|
|
# Conditionally install icons for Linux as they may not be provided by the user theme
|
|
option(INSTALL_ICONS "Install icons" OFF)
|
|
if (INSTALL_ICONS)
|
|
include(ECMInstallIcons)
|
|
ecm_install_icons( ICONS ${ICONS_SRCS} DESTINATION ${KDE_INSTALL_ICONDIR} )
|
|
endif()
|
|
|
|
ecm_qt_install_logging_categories(
|
|
EXPORT KONSOLE
|
|
FILE konsole.categories
|
|
DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}"
|
|
)
|
|
|
|
ki18n_install( po )
|
|
if (KF5DocTools_FOUND)
|
|
kdoctools_install( po )
|
|
endif()
|
|
|
|
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
|
|
|
# add clang-format target for all our real source files
|
|
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.c *.cpp *.h *.hpp)
|
|
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
|
|
if (ECM_VERSION VERSION_GREATER_EQUAL 5.79.0)
|
|
kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
|
|
endif()
|