62 Commits

Author SHA1 Message Date
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
Jaime van Kessel
46ff3f4408 Added unit test stub 2016-04-29 11:32:33 +02:00
Ghostkeeper
16bb754da2 Merge pull request #683 from thopiekar/master-i18n-cmake-fix
CMake: Remove all slashes from language codes
2016-03-29 10:33:48 +02:00
Thomas-Karl Pietrowski
f28cfbf735 CMake: Remove all slashes from language codes
Related to: 6833363b53
2016-03-29 10:17:53 +02:00
Thomas Karl Pietrowski
368718e82b Make all install(*) commands multiline
It makes the CMakeLists.txt (at least for me) easier to read.
2016-03-08 11:07:50 +01:00
Thomas Karl Pietrowski
ce9f6077a2 Renaming cura_app.py into cura on Linux* 2016-03-08 11:07:35 +01:00
Jaime van Kessel
2300410c2e Fuzzy translations are now used by default 2016-02-04 11:45:58 +01:00
Thomas-Karl Pietrowski
350466c73e Adding instructions to CMakeLists.txt to install cura.sharedmimeinfo as cura.xml into ${CMAKE_INSTALL_DATADIR}/mime/packages/ 2016-01-25 19:34:33 +01:00
Thomas-Karl Pietrowski
e1966a7ea5 Scanning i18n directory for languages:
Instead of having a list of languages hardcoded, we scan the i18n directory for available languages.
It was a TODO, which was left after fixing po-file installation. After finding the macro I decided to fix it here.
The reference to the added macro is there as an URL.
2016-01-14 18:31:23 +01:00
Thomas Karl Pietrowski
425a1df865 Fixing i18n build and install
* removes custom target copy-translations
* updating TODO to remove the language list with a nice algorithmus
* renaming file to po_file in foreach-loop
* etc.
2015-12-23 13:29:11 +01:00
Arjen Hiemstra
751f58fb02 Merge branch '15.10'
* 15.10: (39 commits)
  Remove unused import in StartSliceJob
  conforming to code style
  fix typo's..
  Adjust initial view to be slightly from the side
  uses a different method to check whether a machine name excists
  Sets the languageComboBox to the default language
  Remove per-group settings for now
  Make sure to send all settings when an object overrides the profile
  Properly emit writeStarted in RemovableDriveOutputDevice
  Add xy_offset setting to list of settings that trigger a disallowed area update
  Properly trigger a reslice when the active instance is changed
  Wizardpages without hack
  Only hides the window when there are no more pages
  Only add layer data node after all processing
  Also account for "xy_offset" setting for the disallowed areas
  JSON: workaround for stutter in spiralize vase: set travel speed to printing speed
  Adds a color for the error-messages
  Shows an error message when a user tries to add a printer with a name that already excists.
  JSON: support bottom stair step height defaults changed so that the bottom distance to the model isn't violated too much
  Try to use Protobuf CPP implementation if it is available
  ...
2015-11-13 11:31:29 +01:00
Arjen Hiemstra
98d2acaba7 Install the CuraVersion file in the right location on OSX/Win 2015-11-01 22:35:07 +01:00
Arjen Hiemstra
8d0924849f Make it possible to set Cura version from CMake
This helps with automating build so we can set version from one single
spot.
2015-11-01 22:02:54 +01:00