From 7a012672d92e1693093ac71ba368c62b163634d5 Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Sun, 18 Aug 2024 21:38:28 +0200
Subject: [PATCH] cmake prepared for QT_SKIP_DEFAULT_TESTCASE_DIRS

Prepared code for QT_SKIP_DEFAULT_TESTCASE_DIRS that should be released
in the Qt v6.9.

See: https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-126729
---
 cmake/Modules/TinyTestCommon.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/TinyTestCommon.cmake b/cmake/Modules/TinyTestCommon.cmake
index 038b13b18..10f6f7b5c 100644
--- a/cmake/Modules/TinyTestCommon.cmake
+++ b/cmake/Modules/TinyTestCommon.cmake
@@ -139,12 +139,12 @@ function(tiny_configure_test_pch name provides_pch)
         target_compile_definitions(${name} PRIVATE TINYORM_USING_PCH)
     endif()
 
-    # Qt <v6.8.0 breaks REUSE_FROM (was/will be fixed in Qt v6.8.0-beta3)
+    # Qt <v6.9.0 breaks REUSE_FROM (will be fixed in Qt v6.9.0)
     # See: https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-126729
     # Also, I have patched the Qt6TestTargets.cmake so the REUSE_FROM work for me because
     # of this I need to skip this if() using the TINY_QT6_TEST_TARGET_PATCHED environment
     # variable, it also affects CI pipelines on GitHub self-hosted runners
-    if(TINY_QT_VERSION VERSION_LESS "6.8.0" AND
+    if(TINY_QT_VERSION VERSION_LESS "6.9.0" AND
             NOT (DEFINED ENV{TINY_QT6_TEST_TARGET_PATCHED} AND
                 "$ENV{TINY_QT6_TEST_TARGET_PATCHED}")
     )
@@ -154,6 +154,12 @@ function(tiny_configure_test_pch name provides_pch)
         return()
     endif()
 
+    # Disable QT_TESTCASE_BUILDDIR/SOURCEDIR compile definitions for REUSE_FROM to work,
+    # this property doesn't exist in my patched Qt6TestTargets.cmake
+    if(TINY_QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        set_target_properties(${name} PROPERTIES QT_SKIP_DEFAULT_TESTCASE_DIRS YES)
+    endif()
+
     if(provides_pch)
         # Throw an exception if CACHE{TINY_TESTS_PCH_REUSE_FROM} isn't equal to the name
         tiny_throw_if_wrong_reuse_from(${name})