From 1cce2ae5e41c8305c81456eeaf625c172d76a0b1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 6 Feb 2016 16:06:45 +0000 Subject: [PATCH] Look for CuraEngine in ..../CuraEngine/build/CuraEngine[.exe] If you clone CuraEngine inside cura, as the instructions suggest, this is where the CuraEngine build ends up putting it. With this, invoking ./dev-cura actually finds the engine in our build tree. Signed-off-by: Ian Jackson --- Cura/util/sliceEngine.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py index 5d434cf8..d07af336 100644 --- a/Cura/util/sliceEngine.py +++ b/Cura/util/sliceEngine.py @@ -43,6 +43,9 @@ def getEngineFilename(): full_filename = os.path.abspath(os.path.join(base_search_path, '/'.join(['..'] * n), 'CuraEngine', search_filename)) if os.path.isfile(full_filename): return full_filename + full_filename = os.path.abspath(os.path.join(base_search_path, '/'.join(['..'] * n), 'CuraEngine', 'build', search_filename)) + if os.path.isfile(full_filename): + return full_filename if os.path.isfile('/usr/bin/CuraEngine'): return '/usr/bin/CuraEngine' if os.path.isfile('/usr/local/bin/CuraEngine'): -- 2.30.2