[patch] cura 4.1.0 patch

cura-4.1.0-fix-install-paths.patch (text/plain), 2.34 KB, created by qwertyqwertyq on 2019-06-04 09:03:11 UTC

--- Cura-4.1.0-orig/CMakeLists.txt  2017-12-04 18:05:38.000000000 +0200
+++ Cura-4.1.0/CMakeLists.txt   2017-12-29 18:11:19.508034087 +0200
@@ -18,9 +18,9 @@
 
 set(CURA_APP_NAME "cura" CACHE STRING "Short name of Cura, used for configuration folder")
 set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura")
-set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
+set(CURA_VERSION "4.1.0" CACHE STRING "Version name of Cura")
 set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
-set(CURA_SDK_VERSION "" CACHE STRING "SDK version of Cura")
+set(CURA_SDK_VERSION "6.0.0" CACHE STRING "SDK version of Cura")
 set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
 set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
 
@@ -35,6 +35,16 @@
     # Use FindPythonInterp and FindPythonLibs for CMake <3.12
     find_package(PythonInterp 3 REQUIRED)
 
+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()
+endif()
+
     set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
 
     set(Python3_VERSION ${PYTHON_VERSION_STRING})
@@ -63,7 +73,7 @@
 install(DIRECTORY resources
         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
 install(DIRECTORY plugins
-        DESTINATION lib${LIB_SUFFIX}/cura)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
 
 if(NOT APPLE AND NOT WIN32)
     install(FILES cura_app.py
@@ -97,8 +107,8 @@
             DESTINATION ${CMAKE_INSTALL_BINDIR}
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
     install(DIRECTORY cura
-            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
+	    DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
             FILES_MATCHING PATTERN *.py)
     install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
-            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
 endif()