From 70070587ad97f99313029ce65865516b4cc9d299 Mon Sep 17 00:00:00 2001
From: gitlost <burmartke@gmail.com>
Date: Thu, 2 Oct 2025 11:43:33 +0100
Subject: [PATCH] test suite: Windows: use old-fashioned setting of ENVIROMENT
 PATH   instead of ENVIRONMENT_MODIFICATION/path_list_prepend as latter  
 doesn't seem to work (ticket #340, props Ulrich Becker)

---
 backend_qt/tests/CMakeLists.txt | 10 ++--------
 cmake/zint_add_test.cmake       | 20 ++++----------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/backend_qt/tests/CMakeLists.txt b/backend_qt/tests/CMakeLists.txt
index 5fba9993..95fb37e6 100644
--- a/backend_qt/tests/CMakeLists.txt
+++ b/backend_qt/tests/CMakeLists.txt
@@ -20,14 +20,8 @@ add_executable(test_qzint test_qzint.cpp)
 target_link_libraries(test_qzint PRIVATE QZint Qt${QT_VERSION_MAJOR}::Test)
 add_test(NAME qzint COMMAND test_qzint)
 if(MSVC)
-    if(CMAKE_VERSION VERSION_LESS "3.22")
-        set_tests_properties(qzint PROPERTIES ENVIRONMENT
-            "PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/backend_qt/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
-    else()
-        set_tests_properties(qzint PROPERTIES ENVIRONMENT "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
-        set_tests_properties(qzint PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}")
-        set_tests_properties(qzint PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/backend_qt/${CMAKE_BUILD_TYPE}")
-    endif()
+    set_tests_properties(qzint PROPERTIES ENVIRONMENT
+        "PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/backend_qt/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
 else()
     set_tests_properties(qzint PROPERTIES ENVIRONMENT
         "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/backend_qt:$ENV{PATH}")
diff --git a/cmake/zint_add_test.cmake b/cmake/zint_add_test.cmake
index 6b18d5d3..c5ed3de9 100644
--- a/cmake/zint_add_test.cmake
+++ b/cmake/zint_add_test.cmake
@@ -14,14 +14,8 @@ macro(zint_add_test test_name test_command)
         add_test(${test_name} ${test_command})
 
         if(MSVC)
-            if(CMAKE_VERSION VERSION_LESS "3.22")
-                set_tests_properties(${test_name} PROPERTIES ENVIRONMENT
-                    "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
-            else()
-                set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
-                set_tests_properties(${test_name} PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}")
-                set_tests_properties(${test_name} PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}")
-            endif()
+            set_tests_properties(${test_name} PROPERTIES ENVIRONMENT
+                "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
         else()
             set_tests_properties(${test_name} PROPERTIES ENVIRONMENT
                 "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/frontend:$ENV{PATH}")
@@ -35,14 +29,8 @@ macro(zint_add_test test_name test_command)
         endif()
         add_test(${test_name}-static ${test_command}-static)
         if(MSVC)
-            if(CMAKE_VERSION VERSION_LESS "3.22")
-                set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT
-                    "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
-            else()
-                set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
-                set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}")
-                set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}")
-            endif()
+            set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT
+                "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/frontend/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
         else()
             set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT
                 "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/frontend:$ENV{PATH}")