mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-08-03 07:16:31 -04:00
Install gcovr via pipx and disable Werror when building Benchmarks
This commit is contained in:
parent
2bce45260c
commit
bdb3387bff
@ -317,10 +317,14 @@ Ubuntu_GCC_tests_coverage:
|
||||
extends: .Ubuntu_GCC_tests_Debug
|
||||
cache:
|
||||
key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1
|
||||
paths:
|
||||
- .cache/pip
|
||||
variables:
|
||||
BUILD_WITH_CODE_COVERAGE: 1
|
||||
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
|
||||
before_script:
|
||||
- CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
|
||||
- pipx install gcovr
|
||||
coverage: /^\s*lines:\s*\d+.\d+\%/
|
||||
artifacts:
|
||||
paths: []
|
||||
|
@ -57,7 +57,7 @@ declare -rA GROUPED_DEPS=(
|
||||
libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
|
||||
"
|
||||
|
||||
[openmw-coverage]="gcovr"
|
||||
[openmw-coverage]="pipx"
|
||||
|
||||
[openmw-integration-tests]="
|
||||
ca-certificates
|
||||
|
@ -735,7 +735,7 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent(QMouseEvent* event)
|
||||
}
|
||||
}
|
||||
|
||||
const QPointF& pos = event->localPos();
|
||||
QPoint pos = event->position().toPoint();
|
||||
handleMarkerHighlight(pos.x(), pos.y());
|
||||
SceneWidget::mouseMoveEvent(event);
|
||||
}
|
||||
|
1
extern/CMakeLists.txt
vendored
1
extern/CMakeLists.txt
vendored
@ -209,6 +209,7 @@ if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
|
||||
set(BENCHMARK_ENABLE_TESTING OFF)
|
||||
set(BENCHMARK_ENABLE_INSTALL OFF)
|
||||
set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
|
||||
set(BENCHMARK_ENABLE_WERROR OFF)
|
||||
|
||||
include(FetchContent)
|
||||
FetchContent_Declare(benchmark
|
||||
|
Loading…
x
Reference in New Issue
Block a user