diff options
| author | Arjen Hiemstra <ahiemstra@heimr.nl> | 2017-03-15 19:23:54 +0300 |
|---|---|---|
| committer | Arjen Hiemstra <ahiemstra@heimr.nl> | 2017-03-15 19:23:54 +0300 |
| commit | 04e517eddfcbfe680f94f73d05ed23b7ecdc809e (patch) | |
| tree | ca4b95ba3d51f2fa9a47d602faeade35d0cdb9ee /cmake | |
| parent | 1dbec7073809b218c93d08a449707879705a7c6c (diff) | |
Do not hardcode the path to Uranium but use a cache variable
This allows us to override the uranium dir and make sure it is still
found even when it is not the same as "../uranium"
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CuraTests.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 5c58330a48..cf9fa4ba68 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -30,13 +30,13 @@ function(cura_add_test) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT PYTHONPATH=${_PYTHONPATH}) endfunction() -cura_add_test(NAME pytest-main DIRECTORY ${CMAKE_SOURCE_DIR}/tests PYTHONPATH "${CMAKE_SOURCE_DIR}/../Uranium:${CMAKE_SOURCE_DIR}") +cura_add_test(NAME pytest-main DIRECTORY ${CMAKE_SOURCE_DIR}/tests PYTHONPATH "${CMAKE_SOURCE_DIR}:${URANIUM_DIR}") file(GLOB_RECURSE _plugins plugins/*/__init__.py) foreach(_plugin ${_plugins}) get_filename_component(_plugin_directory ${_plugin} DIRECTORY) if(EXISTS ${_plugin_directory}/tests) get_filename_component(_plugin_name ${_plugin_directory} NAME) - cura_add_test(NAME pytest-${_plugin_name} DIRECTORY ${_plugin_directory} PYTHONPATH "${CMAKE_SOURCE_DIR}/../Uranium:${CMAKE_SOURCE_DIR}:${_plugin_directory}") + cura_add_test(NAME pytest-${_plugin_name} DIRECTORY ${_plugin_directory} PYTHONPATH "${_plugin_directory}:${CMAKE_SOURCE_DIR}:${URANIUM_DIR}") endif() endforeach() |