Skip to content
This repository was archived by the owner on Mar 20, 2025. It is now read-only.

Commit ee5ec34

Browse files
committed
tests: Simplify: Remove 5.15/6.0+ check for OMEMO
1 parent b6b095e commit ee5ec34

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

tests/travis/build-and-test

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ CMAKE_ARGS="-DBUILD_TESTS:BOOL=True"
1313
case "$CONFIG" in
1414
full*)
1515
CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_GSTREAMER:BOOL=True"
16-
case "$QT_VERSION" in
17-
5.15* | 6*)
18-
if [ $HOST_SYSTEM = "Linux" ]; then
19-
# Enable OMEMO
20-
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
21-
fi
22-
;;
23-
esac
24-
;;
25-
esac
2616

27-
case "$CONFIG" in
17+
# Enable OMEMO
18+
if [ $HOST_SYSTEM = "Linux" ]; then
19+
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
20+
fi
21+
;;
2822
*debug*)
2923
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=Debug -DBUILD_INTERNAL_TESTS:BOOL=True"
3024
;;

tests/travis/install-build-depends-debian

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ full*)
3434
libprotobuf-c-dev \
3535
libssl-dev
3636

37-
# Enable OMEMO for Qt > 5.15 (including Qt 6)
3837
# Build and install qca and libomemo-c
39-
case "$QT_VERSION" in
40-
5.15* | 6)
41-
install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
42-
install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
43-
;;
44-
esac
38+
install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
39+
install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
4540
;;
4641
esac

0 commit comments

Comments
 (0)