diff --git a/backend_qt/tests/CMakeLists.txt b/backend_qt/tests/CMakeLists.txt index 3631b92b..d19aab56 100644 --- a/backend_qt/tests/CMakeLists.txt +++ b/backend_qt/tests/CMakeLists.txt @@ -20,8 +20,9 @@ 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) + string(REPLACE ";" "\\;" env_path "$ENV{PATH}") set_tests_properties(qzint PROPERTIES ENVIRONMENT - "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_BINARY_DIR}/backend/${CMAKE_BUILD_TYPE}\;${CMAKE_BINARY_DIR}/backend_qt/${CMAKE_BUILD_TYPE}\;$ENV{PATH}") + "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};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 c5ed3de9..ceb7bf1d 100644 --- a/cmake/zint_add_test.cmake +++ b/cmake/zint_add_test.cmake @@ -14,8 +14,9 @@ macro(zint_add_test test_name test_command) add_test(${test_name} ${test_command}) if(MSVC) + string(REPLACE ";" "\\;" env_path "$ENV{PATH}") 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};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/frontend:$ENV{PATH}") @@ -29,8 +30,9 @@ macro(zint_add_test test_name test_command) endif() add_test(${test_name}-static ${test_command}-static) if(MSVC) + string(REPLACE ";" "\\;" env_path "$ENV{PATH}") 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};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/backend;PATH=${CMAKE_BINARY_DIR}/frontend:$ENV{PATH}")