From baa780aa669d3ec63979f8c0b34844fbeafc40b7 Mon Sep 17 00:00:00 2001 From: Vitozz Date: Tue, 7 May 2024 12:40:07 +0300 Subject: [PATCH] Added MSVC ccache support. Fixed typo --- CMakeLists.txt | 8 ++++++++ src/widgets/psitabwidget.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11a294646..fbae27ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,6 +286,14 @@ if(USE_CCACHE) find_program(CCACHE_PATH ccache DOC "Path to ccache") if(CCACHE_PATH) message(STATUS "Found ccache at ${CCACHE_PATH}") + if(MSVC AND (CMAKE_VERSION VERSION_GREATER "3.13.0")) + set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$:Embedded>") + set(CMAKE_VS_GLOBALS + "TrackFileAccess=false" + "UseMultiToolTask=true" + "DebugInformationFormat=OldStyle" + ) + endif() set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_PATH}) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_PATH}) endif() diff --git a/src/widgets/psitabwidget.cpp b/src/widgets/psitabwidget.cpp index d9fba2c28..502550af7 100644 --- a/src/widgets/psitabwidget.cpp +++ b/src/widgets/psitabwidget.cpp @@ -275,7 +275,7 @@ void PsiTabWidget::setTabText(QWidget *widget, const QString &label) shortLabel = label.first(37) + "..."; #endif int maxLength = 80; - // If label text is longer than 80 symbols then make lable multiline + // If label is longer than 80 symbols make this label multiline if (labelSize > maxLength) { QStringList sentences; for (int i = 0; i < labelSize;) {