74 Commits

Author SHA1 Message Date
Evangelos Trantos
fc4de53269
Add the CURA_DIGITAL_FACTORY_URL variable in the CMakeLists file.
In this way it can be used as an argument during the Cura build configuration.
2020-09-14 21:13:05 +02:00
Jelle Spijker
2d1128f088
Merge pull request #8196 from Ultimaker/speed_up_ci
Speed up ci
2020-08-28 12:57:39 +02:00
Ghostkeeper
808a0bf4aa
Don't use the new FindPython3 script from CMake
I don't know what it is with this one, but it's finding the wrong one. We specify through the prefix that it should search in the cura-build-environment first, but apparently it's not listening to that. As a result it's getting Python 3.6, and then stops because it can't find the headers for that version. It wouldn't need the headers in this case, but if it didn't crash here it would crash during the run time because libArcus and libSavitar have been linked to Python 3.5.
2020-08-20 14:30:28 +02:00
Jaime van Kessel
a9c67542bf
Don't generate the translations when running the CI 2020-08-14 16:01:40 +02:00
Thomas Karl Pietrowski
2ddb44a047
CMake: Fixing warning about path conversion
According to what I found in the docs[1], there is no "DIRECTORY" available as <type>.
Therefore, correcting it to "PATH", which is according to the docs correct.

At the moment I'm getting the following error[2]:
-----------
CMake Warning (dev) at CMakeLists.txt:8 (set):
  implicitly converting 'DIRECTORY' to 'STRING' type.
This warning is for project developers.  Use -Wno-dev to suppress it.

CMake Warning (dev) at CMakeLists.txt:9 (set):
  implicitly converting 'DIRECTORY' to 'STRING' type.
This warning is for project developers.  Use -Wno-dev to suppress it.
---------------
[1] https://cmake.org/cmake/help/v3.6/command/set.html
[2] https://launchpadlibrarian.net/464670600/buildlog_ubuntu-focal-amd64.cura_1%3A4.5~202002121434~rev4433~pkg330~ubuntu20.04.1_BUILDING.txt.gz
2020-02-22 18:34:21 +01:00
Ghostkeeper
ad2b8f140e
Make Marketplace link configurable from the build system
This way you could set it to marketplace-staging if you like.

Contributes to issue CURA-7071.
2020-01-28 11:52:46 +01:00
Lipu Fei
9e6207794b Add CMake options to exclude plugins for installation
CURA-6557
2019-10-28 14:37:22 +01:00
Lipu Fei
178f73ec62 Fix CURA_CLOUD_ACCOUNT_API_ROOT config 2019-07-04 15:58:27 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Lipu Fei
fe21d67b88 Fix CI on hal9000 2019-04-03 08:51:16 +00:00
Lipu Fei
31e20e78b6 Use GitLab CI 2019-04-03 07:49:26 +00:00
fieldOfView
e66875865f Make Cura app name configurable in CuraVersion 2018-11-13 16:08:29 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable
CURA-5842
2018-11-01 12:15:00 +01:00
Lipu Fei
fae9bc838b Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:18:45 +02:00
Lipu Fei
9223122fc8 Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:13:27 +02:00
Lipu Fei
fea37b52be Fix CURA_PACKAGES_VERSION 2018-05-22 12:07:44 +02:00
Lipu Fei
ea421204f3 Add CURA_PACKAGES_VERSION to CMakeLists.txt 2018-05-22 11:02:12 +02:00
Ghostkeeper
aa92d4d0f9
Add to all installation to lib/ folders
Some systems have a suffix there to indicate the address size, such as lib64.
2017-11-17 11:46:55 +01:00
awhiemstra
f02cc66e81 Install AppStream metadata into share/metainfo
Rather than share/appstream. This is what is suggested by the specification.

Fixes #2563
2017-10-10 08:30:56 +00:00
Ghostkeeper
e8691d29a7
Install CuraVersion.py also to site-packages on non-Debian
Similar to the rest of Cura.

Contributes to issue CURA-3368.
2017-09-15 16:05:22 +02:00
Ghostkeeper
fa266969eb
Don't install to /cura subdirectory of site-packages
That's already done by the directory name itself.

Contributes to issue CURA-3368.
2017-09-15 16:05:22 +02:00
Ghostkeeper
6484df3e60
Install to correct site-packages on non-Debian computers
Because dist-packages is a Debian thing only.

Contributes to issue CURA-3368.
2017-09-15 16:05:22 +02:00
Thomas Karl Pietrowski
2b78e8abde Install cura icon on Linux
This commit is needed for b9970d57b4
Never tested it, but believing the author of the commit that this change will work.
2017-08-30 19:32:38 +02:00
Jaime van Kessel
ae95f41a3e Removed include of cpack from cmake lists 2017-04-05 13:29:25 +02:00
Ghostkeeper
d7f603517d
Add Uranium CMake dir if it is set
Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Arjen Hiemstra
04548d2862 Add Uranium's cmake dir to CMAKE_MODULE_PATH
This makes sure URANIUM_TRANSLATION_TOOLS can be found
2017-03-15 17:34:38 +01:00
Arjen Hiemstra
04e517eddf 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"
2017-03-15 17:23:54 +01:00
Ghostkeeper
e83fd3a321
Remove old adding of tests
No longer needed.
2017-03-13 12:40:47 +01:00
Ghostkeeper
ecc973951e
Support running unit tests for plug-ins 2017-03-13 12:30:47 +01:00
Arjen Hiemstra
8a77dd66fc Properly handle CMake options that are enabled but not "ON"
Contributes to CURA-2787
2017-03-06 17:26:02 +01:00
Arjen Hiemstra
2e894477c8 Make Debug mode a build-time option instead of a hardcoded value 2016-12-15 16:46:13 +01:00
Thomas Karl Pietrowski
a0ba393673 Merge remote-tracking branch 'upstream/master' into UM3NPP_merge 2016-11-21 14:44:19 +01:00
Thomas Karl Pietrowski
c48d064eca Merge remote-tracking branch 'UM3NPP/master' into UM3NPP_merge
Contributes to CURA-2862
2016-11-17 21:10:29 +01:00
Simon Edwards
ba0fba0844 Bump the Python version number for Cura.
CURA-2150 Upgrade to PyQt 5.6 and Python 3.5
2016-11-09 12:56:11 +01:00
Arjen Hiemstra
4464b7d40a Fix installation of AppData file 2016-10-10 13:38:03 +02:00
Richard Hughes
6c81c9a735 Add an example AppData file so that Cura is visible in Linux software centers
Fixes: https://github.com/Ultimaker/Cura/issues/530
2016-10-08 10:01:35 +01:00
awhiemstra
7408f31738 Change install location to UM3NetworkPrinting
Contributes to CURA-2342
2016-09-27 15:53:33 +02:00
Jack Ha
6069182175 Added UM3InfoComponents.qml to CMakeLists to the file also gets installed in the build 2016-09-13 09:50:04 +02:00
awhiemstra
16605a3e01 Move the UraniumTranslationTools include into the enabled check
So that we can still build Cura even if we do not care about translations.
2016-09-06 17:13:15 +02:00
Thomas Karl Pietrowski
aa2ba26a82 Merge remote-tracking branch 'upstream/master' into master-CURA-1696 2016-09-05 22:15:18 +02:00
Thomas Karl Pietrowski
cd9e049895 CMake: Skip looking for C/C++ compiler 2016-09-02 11:12:28 +02:00
Thomas Karl Pietrowski
1699cd741f CMake: Skip looking for C/C++ compiler 2016-09-01 15:57:44 +02:00
Thomas Karl Pietrowski
6d18540fa7 CURA-1696: Using Uranium's translation tools 2016-08-14 19:30:31 +02:00
Thomas Karl Pietrowski
0a126cf809 Generate cura.desktop (#668)
Adds support to install Cura to an alternative path, while generating a correct .desktop file for it.

* Renaming cura.desktop to cura.desktop.in
* CMAKE: Generate .desktop from .desktop.in
* Replace hardcoded paths with FULL_PATHs
* Tell CMake to generate cura.desktop
* CMake: Set full paths for .desktop generation
   * It tells CMake where to find the .desktop.in is and where to store the result.
2016-08-07 08:38:15 +02:00
awhiemstra
4fec82fab7 Fix CMakeLists to include the discovery action
Also remove a no-longer existing file
2016-07-05 10:31:15 +02:00
Jaime van Kessel
78a0c623ef Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-17 14:59:16 +02:00
Thomas Karl Pietrowski
c62ab6e937 Adding a field of the build type to the spashscreen.
For example, if the community distributes Cura in a different way, they
can set CURA_BUILDTYPE via 'cmake -DCURA_BUILDTYPE=' and whenever Cura
is launched " (PPA)" will be appended. Of course, this could be done by
appending " (PPA)" to CURA_VERSION, but in case of my Ubuntu/Debian
packaging it will only need one modification in debian/changelog to
change the version. During build (debian/rules) this version will be
read from debian/changelog.
Changing the version number across different files, is a waste of time.

Finally, we can use that field in the future to indicate debug or other
other special builds.
2016-06-04 13:55:35 +02:00
Arjen Hiemstra
3f4e740c0d Add a CMakeLists file so the plugin can be installed 2016-05-18 17:58:15 +02:00
Jaime van Kessel
2b3c3b1b51 Fixed python path for tests 2016-04-29 12:14:05 +02:00