forked from pool/cura-lulzbot
Adrian Schröter
47e918eeea
OBS-URL: https://build.opensuse.org/package/show/science/cura-lulzbot?expand=0&rev=84
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 022ca9490..ceb88266b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -46,13 +46,8 @@ if (NOT BUILD_PYTHON)
|
|
endif()
|
|
|
|
if(NOT PYTHON_SITE_PACKAGES_DIR)
|
|
- if(APPLE OR WIN32)
|
|
- set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
|
|
- CACHE STRING "Directory to install Python bindings to")
|
|
- else()
|
|
- set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
|
|
- CACHE STRING "Directory to install Python bindings to")
|
|
- endif()
|
|
+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
|
|
+ CACHE STRING "Directory to install Python bindings to")
|
|
set(CURA_INSTALL_PLUGINS_PATH lib/cura)
|
|
else()
|
|
set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura)
|
|
diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py
|
|
index 863c5f443..c668ce294 100644
|
|
--- a/cura/CuraSplashScreen.py
|
|
+++ b/cura/CuraSplashScreen.py
|
|
@@ -44,8 +44,7 @@ class CuraSplashScreen(QSplashScreen):
|
|
pass
|
|
|
|
def drawContents(self, painter):
|
|
- if self._to_stop:
|
|
- return
|
|
+ return
|
|
|
|
painter.save()
|
|
painter.setPen(QColor(0, 0, 0, 255))
|
|
diff --git a/cura_app.py b/cura_app.py
|
|
index e75db4e19..1fb4ffbd0 100644
|
|
--- a/cura_app.py
|
|
+++ b/cura_app.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python3
|
|
+#!/usr/bin/python3
|
|
|
|
# Copyright (c) 2015 Ultimaker B.V.
|
|
# Cura is released under the terms of the LGPLv3 or higher.
|