Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-09 21:15:57 +00:00
Code Issues Projects Releases Wiki Activity

test suite: Windows: use old-fashioned setting of ENVIROMENT PATH

Browse Source 
instead of ENVIRONMENT_MODIFICATION/path_list_prepend as latter
  doesn't seem to work (ticket #340, props Ulrich Becker)
This commit is contained in:
gitlost
2025-10-02 11:43:33 +01:00
parent d2b4904401
commit 70070587ad
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend_qt/tests/CMakeLists.txt
View File

@@ -20,14 +20,8 @@ add_executable(test_qzint test_qzint.cpp)
target_link_libraries(test_qzint PRIVATE QZint Qt${QT_VERSION_MAJOR}::Test) target_link_libraries(test_qzint PRIVATE QZint Qt${QT_VERSION_MAJOR}::Test)
add_test(NAME qzint COMMAND test_qzint) add_test(NAME qzint COMMAND test_qzint)
if(MSVC) if(MSVC)
if(CMAKE_VERSION VERSION_LESS "3.22") set_tests_properties(qzint PROPERTIES ENVIRONMENT
set_tests_properties(qzint PROPERTIES ENVIRONMENT "PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/backend_qt/${CMAKE_BUILD_TYPE}\;$ENV{PATH}")
"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()
else() else()
set_tests_properties(qzint PROPERTIES ENVIRONMENT set_tests_properties(qzint PROPERTIES ENVIRONMENT
"LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/backend_qt:$ENV{PATH}") "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/backend_qt:$ENV{PATH}")

20
cmake/zint_add_test.cmake
View File

@@ -14,14 +14,8 @@ macro(zint_add_test test_name test_command)
add_test(${test_name} ${test_command}) add_test(${test_name} ${test_command})
if(MSVC) if(MSVC)
if(CMAKE_VERSION VERSION_LESS "3.22") set_tests_properties(${test_name} PROPERTIES ENVIRONMENT
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}")
"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()
else() else()
set_tests_properties(${test_name} PROPERTIES ENVIRONMENT 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}") "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() endif()
add_test(${test_name}-static ${test_command}-static) add_test(${test_name}-static ${test_command}-static)
if(MSVC) if(MSVC)
if(CMAKE_VERSION VERSION_LESS "3.22") set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT
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}")
"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()
else() else()
set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT 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}") "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/frontend:$ENV{PATH}")