[neon/extras/qca2/Neon/release] debian: ciphertest: generalize a bit

[Pino Toscano]

Git commit 95938c0367ee5cf40bbb49fa406fddeb286b743e by Pino Toscano.
Committed on 15/07/2023 at 06:06.
Pushed by jriddell into branch 'Neon/release'.

ciphertest: generalize a bit

M  +4    -0    debian/changelog
M  +4    -9    debian/tests/ciphertest/CMakeLists.txt
M  +2    -2    debian/tests/ciphertest/run-test

https://invent.kde.org/neon/extras/qca2/-/commit/95938c0367ee5cf40bbb49fa406fddeb286b743e

diff --git a/debian/changelog b/debian/changelog
index 3f40270..90ca522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qca2 (2.3.6-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * General changes to the ciphertest autopkgtest source:
+    - generalize it a bit w.r.t. the Qt version to use
+    - drop leftovers of Qt 4 support
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Jul 2023 08:00:02 +0200
 
diff --git a/debian/tests/ciphertest/CMakeLists.txt b/debian/tests/ciphertest/CMakeLists.txt
index 26ac482..0eb17b4 100644
--- a/debian/tests/ciphertest/CMakeLists.txt
+++ b/debian/tests/ciphertest/CMakeLists.txt
@@ -2,20 +2,15 @@ cmake_minimum_required(VERSION 3.13)
 
 project(ciphertest)
 
-option(USE_QT5 "Build for Qt5" OFF)
-
-if(USE_QT5)
+if(QT_VERSION STREQUAL "5")
   find_package(Qt5Core REQUIRED)
   find_package(Qca-qt5 REQUIRED)
-else()
-  find_package(Qt4 REQUIRED)
-  find_package(Qca REQUIRED)
+elseif()
+  message(FATAL_ERROR "unknown QT_VERSION: '${QT_VERSION}'")
 endif()
 
 add_executable(ciphertest ciphertest.cpp)
 
-if(USE_QT5)
+if(QT_VERSION STREQUAL "5")
   target_link_libraries(ciphertest Qt5::Core qca-qt5)
-else()
-  target_link_libraries(ciphertest ${QT_QTCORE_LIBRARY} qca)
 endif()
diff --git a/debian/tests/ciphertest/run-test b/debian/tests/ciphertest/run-test
index a3a6c26..c5cb26f 100755
--- a/debian/tests/ciphertest/run-test
+++ b/debian/tests/ciphertest/run-test
@@ -5,9 +5,9 @@ set -e
 TESTDIR=$(pwd)/debian/tests/ciphertest
 
 if [ "$1" = "--qt5" ]; then
-  CONF_FLAGS="-DUSE_QT5=ON"
+  CONF_FLAGS="-DQT_VERSION=5"
 else
-  echo "Usage $1 <--qt4,--qt5>"
+  echo "Usage $1 <--qt5>"
   exit 1
 fi