File 0003-Move-CMake-code-for-testing-to-the-right-p... of Package libmlt

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Move-CMake-code-for-testing-to-the-right-position-fo.patch of Package libmlt (Revision 51572fcb36a67a36d40cbc20c8fc6d99)

Currently displaying revision 51572fcb36a67a36d40cbc20c8fc6d99 , Show latest

From 26a6071c91eefc68fa557972bbca558385f1711d Mon Sep 17 00:00:00 2001
From: jlskuz <78424983+jlskuz@users.noreply.github.com>
Date: Wed, 3 Aug 2022 01:35:17 +0200
Subject: [PATCH 3/5] Move CMake code for testing to the right position (for
 Qt) (#817)

---
 CMakeLists.txt | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea2c782..9ddaf0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,18 +173,6 @@ endif()
 
 pkg_check_modules(sdl2 IMPORTED_TARGET sdl2)
 
-if (BUILD_TESTS_WITH_QT6)
-    set(QT_MAJOR_VERSION 6)
-else()
-    set(QT_MAJOR_VERSION 5)
-endif()
-
-if(BUILD_TESTING)
-  find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Test)
-  find_package(Kwalify REQUIRED)
-  enable_testing()
-endif()
-
 if(MOD_QT OR MOD_QT6 OR MOD_PLUS)
   pkg_check_modules(FFTW IMPORTED_TARGET fftw3)
   if(NOT FFTW_FOUND)
@@ -298,6 +286,8 @@ if(MOD_PLUSGPL)
   list(APPEND MLT_SUPPORTED_COMPONENTS plusgpl)
 endif()
 
+# It is necessary to look for Qt6 before Qt5, otherwise there will
+# be a conflict with the targets in case both are enabled
 if(MOD_QT6)
   find_package(Qt6 COMPONENTS Core Gui Xml SvgWidgets Core5Compat)
   if(Qt6_FOUND)
@@ -307,6 +297,7 @@ if(MOD_QT6)
   endif()
 endif()
 
+
 #if(MOD_GLAXNIMATE_QT6)
 #  find_package(Qt6 COMPONENTS Core Gui Widgets Xml)
 #  if(Qt6_FOUND)
@@ -316,6 +307,18 @@ endif()
 #  endif()
 #endif()
 
+if (BUILD_TESTS_WITH_QT6)
+    set(QT_MAJOR_VERSION 6)
+else()
+    set(QT_MAJOR_VERSION 5)
+endif()
+
+if(BUILD_TESTING)
+  find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Test)
+  find_package(Kwalify REQUIRED)
+  enable_testing()
+endif()
+
 if(MOD_QT)
   find_package(Qt5 COMPONENTS Core Xml Gui Svg Widgets)
   if(Qt5_FOUND)
-- 
2.37.1

Places

File 0003-Move-CMake-code-for-testing-to-the-right-position-fo.patch of Package libmlt (Revision 51572fcb36a67a36d40cbc20c8fc6d99)

Places