Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 02:35:41 +03:00
Code Issues Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-19 13:36:49 +01:00
parent 8c997fe172
commit e8367cea5c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -314,7 +314,7 @@ jobs:
uses: GabrielBB/xvfb-action@v1
with:
working-directory: build/release
run: ninja check
run: ninja check --verbose
- name: Test (Windows)
if: matrix.env.ninja_platform == 'win'

4
dep/scintilla/CMakeLists.txt
View File

@ -58,7 +58,9 @@ target_link_libraries(scintilla Qt5::Widgets lexilla)
set_target_properties(scintilla PROPERTIES AUTOMOC ON)
set(SCINTILLUA_LEXERS_DIR ${RESOURCES_DIR}/lexers)
set(SCINTILLUA_LEXERS_DIR
${RESOURCES_DIR}/lexers
CACHE INTERNAL "")
set(SRC_SCINTILLUA_LEXERS_DIR
${CMAKE_CURRENT_SOURCE_DIR}/scintillua/lexers
CACHE INTERNAL "")

8
l10n/CMakeLists.txt
View File

@ -53,8 +53,8 @@ foreach(QM_FILE ${QT_QM_FILES})
endforeach()
foreach(QM_FILE ${QM_FILES})
install(
FILES ${QM_FILE}
DESTINATION ${L10N_INSTALL_DIR}
COMPONENT ${GITTYUP_NAME})
install(
FILES ${QM_FILE}
DESTINATION ${L10N_INSTALL_DIR}
COMPONENT ${GITTYUP_NAME})
endforeach()

2
src/app/Application.cpp
View File

@ -106,7 +106,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
qDebug() << QString("App dir: %1").arg(Settings::appDir().absolutePath());
qDebug() << QString("Doc dir: %1").arg(Settings::docDir().absolutePath());
qDebug() << QString("Conf dir: %1").arg(Settings::confDir().absolutePath());
qDebug() << QString("l18n dir: %1").arg(Settings::l10nDir().absolutePath());
qDebug() << QString("l10n dir: %1").arg(Settings::l10nDir().absolutePath());
qDebug() << QString("dictionaries dir: %1")
.arg(Settings::dictionariesDir().absolutePath());
qDebug() << QString("lexer dir: %1").arg(Settings::lexerDir().absolutePath());

2
src/conf/CMakeLists.txt
View File

@ -11,5 +11,5 @@ target_compile_definitions(
L10N_DIR="${L10N_INSTALL_DIR}"
SRC_L10N_DIR="${CMAKE_SOURCE_DIR}/l10n"
SCINTILLUA_LEXERS_DIR="${SCINTILLUA_LEXERS_DIR}"
SRC_SCINTILLUA_LEXERS_DIR="${SCINTILLUA_LEXERS_DIR}")
SRC_SCINTILLUA_LEXERS_DIR="${SRC_SCINTILLUA_LEXERS_DIR}")
set_target_properties(conf PROPERTIES AUTOMOC ON)