From 80ba5fc97dc4e328e1303bc5fd7cd3e337fb0585 Mon Sep 17 00:00:00 2001 From: Ruben D Date: Sat, 30 Dec 2017 17:11:11 +0100 Subject: [PATCH] Fix PYTHONPATH pass-through This makes sure that any pythonpath on the user's environment is also used for these tests. The same fix as here: https://github.com/Ultimaker/Uranium/commit/31106cd60af774d8cd0ed24e18615a6491212b34 --- cmake/CuraTests.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index f93313e39a..ffe4616bf3 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -24,8 +24,10 @@ function(cura_add_test) if(WIN32) string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH}) + set(_PYTHONPATH "${_PYTHONPATH}\\;$ENV{PYTHONPATH}") else() string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH}) + set(_PYTHONPATH "${_PYTHONPATH}:$ENV{PYTHONPATH}") endif() get_test_property(${_NAME} ENVIRONMENT test_exists) #Find out if the test exists by getting a property from it that always exists (such as ENVIRONMENT because we set that ourselves).