3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 20:01:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix PYTHONPATH pass-through

Browse source 
This makes sure that any pythonpath on the user's environment is also used for these tests. The same fix as here: 31106cd60a
This commit is contained in:
Ruben D 2017-12-30 17:11:11 +01:00
parent 28919a57a4
commit 80ba5fc97d
No known key found for this signature in database
GPG key ID: 6B42C9465E304A62
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/CuraTests.cmake
View file

@ -24,8 +24,10 @@ function(cura_add_test)
if(WIN32) if(WIN32)
string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH}) string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH})
set(_PYTHONPATH "${_PYTHONPATH}\\;$ENV{PYTHONPATH}")
else() else()
string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH}) string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH})
set(_PYTHONPATH "${_PYTHONPATH}:$ENV{PYTHONPATH}")
endif() 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). 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).