Commit Graph

9 Commits

Author SHA1 Message Date
luz paz
971bb6695b CMake: correct non-POSIX friendly 'sed-i' arg in FindPySide2Tools.cmake
resolves #0004588  
ticket: https://tracker.freecadweb.org/view.php?id=4588  
Patch provided by 'garya'  
Tweaked comment to reflect the patch change. [skip ci]
2021-03-08 14:19:44 +01:00
Jeffrey Zampieron
29e1117c8a Make sure we can find pyside on osx 2020-09-03 12:06:59 +02:00
Warren Falk
9675611aca [CMake] Find old pyside2 uic and rcc when they are named pyuic5 and pyrcc5
Found that on ubuntu 20.04 where QT is still at 5.12, these are called pyuic5 and pyrcc5 now and cmake will not find these and then the build fails without this change
2020-07-03 14:41:11 +02:00
Adrian Schröter
1bca53917d Find uic and rcc on openSUSE
openSUSE (and most likely other distributions) is renaming uic and rcc
to avoid file conflicts with Qt4.

Prefer these if they exist
2020-01-27 10:09:15 +01:00
howetuft
1666b28836 Change IF(...LESS...) into IF(...VERSION_LESS...) 2020-01-08 15:19:27 +01:00
howetuft
17ed2b196a [Cmake] Update FindPySide2Tools for PySide2 5.14 - issue #4229
Since PySide2 5.14, 'pyside2-rcc' and 'pyside2-uic' have been renamed into plain 'rcc' and 'uic'.
This leads FindPySide2Tools.cmake to no longer find rcc/uic, as reported in bug #4229 (https://www.freecadweb.org/tracker/view.php?id=4229) and prevents compilation.
FindPySide2Tools has been updated accordingly.
2020-01-08 15:19:27 +01:00
Peter Lama
c44ade6961 Fix build error on MacOS due to sed command usage
Non GNU sed on macOS expects suffix after -i option (can be empty str).
However, removing the comments from the pyside generated files is not a necessary
operation (presumably done to avoid a diff when no code changed), so simply skip the operation on macOS
2018-08-15 09:13:03 +02:00
Ryan Pavlik
5f8f268244 Apply equivalent changes to FindPySide2Tools as FindPySideTools.
These are largely matching files, potential to de-duplicate them, but this
just ports the changes over for now.
2018-08-11 17:39:15 +02:00
Mateusz Skowroński
80e8ae63e8 Use PySide2 tools for Qt5. 2016-12-24 15:33:15 +01:00