diff options
author | Diane Bruce <db@FreeBSD.org> | 2021-01-16 16:25:42 +0000 |
---|---|---|
committer | Diane Bruce <db@FreeBSD.org> | 2021-01-16 16:25:42 +0000 |
commit | c36b178ee4ae8ec3bd2fde3fac1376da7f3b112b (patch) | |
tree | 4e40d094d203cfce2164d16c706e3748fa638a17 /cad/cura/files/patch-CMakeLists.txt | |
parent | N.B. this port does not use distutils hence flavors *was not* defined. (diff) |
Finally update cura now that all prequisite ports are updated.
PR: ports/251236
Diffstat (limited to 'cad/cura/files/patch-CMakeLists.txt')
-rw-r--r-- | cad/cura/files/patch-CMakeLists.txt | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/cad/cura/files/patch-CMakeLists.txt b/cad/cura/files/patch-CMakeLists.txt index aa360363d3c0..f3a947f4cfa8 100644 --- a/cad/cura/files/patch-CMakeLists.txt +++ b/cad/cura/files/patch-CMakeLists.txt @@ -1,24 +1,11 @@ ---- CMakeLists.txt.orig 2020-02-28 16:06:57 UTC +--- CMakeLists.txt.orig 2020-12-25 04:46:02 UTC +++ CMakeLists.txt -@@ -6,8 +6,9 @@ include(GNUInstallDirs) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - - set(URANIUM_DIR "${CMAKE_SOURCE_DIR}/../Uranium" CACHE PATH "The location of the Uranium repository") --set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository") -- -+if(NOT DEFINED URANIUM_SCRIPTS_DIR) -+ set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository") -+endif() - # Tests - include(CuraTests) - -@@ -67,6 +68,9 @@ install(DIRECTORY resources - - include(CuraPluginInstall) - -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ set(FREEBSD True) -+endif() - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -20,7 +20,7 @@ option(GENERATE_TRANSLATIONS "Should the translations + + 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 "%%DISTVERSION%%" CACHE STRING "Version name of Cura") + set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") + set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") + set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") |