Commit Graph

153 Commits

Author SHA1 Message Date
Bernd Waibel
a8be139cbc Improve search for coin3d tag file
Currently cmake looks for coin.tag and coin.tag.gz when searching a
tag file of the Coin3D documentation. On some coin3d installations,
the tag file is named Coin.tag or Coin.tag.gz. This patch improves
the search by adding additional hints to the find_file() test for
the tag file.
2018-09-01 20:58:40 +02:00
wmayer
3927a2ed8b reduce compile time after each time cmake configure is executed (Version.h) 2018-08-21 14:06:33 +02:00
wmayer
e5a1a9d35a macro to check for different input and output file and if needed replace output file 2018-08-21 13:52:42 +02:00
wmayer
16295d4121 CMake 2.8.12 and lower allowed the SOURCE signature in add_custom_command
In CMake 3.0 the policy CMP0050 was introduced where it could be set to OLD to keep this behaviour while for NEW an error was raised.
Since CMake 3.5.2 a warning comes up when using the OLD behaviour and that it will be removed in a future version.

In FreeCAD we switched to the new behaviour now and removed the SOURCE signature from add_custom_command which affects the macros
fc_copy_sources, fc_target_copy_resource and fc_target_copy_resource_flat and their usage.
It's not possible any more to add files to a target by using the macros. Now a file must be added to the target before using the macros.

This commit fixes it for Arch, Draft, OpenSCAD, Material, Plot and Ship
2018-08-20 11:47:39 +02:00
wmayer
82b31d50e5 clean up cmake macros add new macro fc_target_copy_resource_flat 2018-08-19 22:54:33 +02:00
wmayer
3ffd435526 move cmake policy CMP0050 to new style 2018-08-19 13:59:42 +02:00
wmayer
fc6e6a55ea fix broken generate_from_xml macro 2018-08-19 13:34:05 +02: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
Kyrre Sjobak
ff93395221 Give FindNETGEN a path hint so that it ACTUALLY works with the standard Fedora 28 netgen package. 2018-08-12 20:19:01 +02:00
Kyrre Sjobak
e903690e0c Give FindNETGEN a path hint so that it works with the standard Fedora 28 netgen package. 2018-08-12 20:19:01 +02:00
Kyrre Sjobak
9a6dcff1de Give FindMEDFile a path hint so that it works with the standard Fedora 28 med-devel package. 2018-08-12 20:19:01 +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
Ryan Pavlik
bf043fe68f Fix typo in FreeCadMacros.cmake 2018-08-11 17:39:15 +02:00
Ryan Pavlik
f12c4092ab Quote paths used in FindPySideTools.cmake 2018-08-11 17:39:14 +02:00
Ryan Pavlik
75c698d180 Fix policy warning with CMake (regarding "no rules to generate")
Fixed by using add_custom_command instead of execute_process,
with an in-place sed command included to strip timestamp just like
previous code.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
b844589cf5 Clean up and make FindPySideTools CMake module more robust 2018-08-11 17:39:13 +02:00
Ryan Pavlik
cf79125dd6 Add fc_target_copy_resource/fc_copy_sources build message
Includes optional verbosity param for tracking down "two rules for..."
ninja/etc warnings.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
2ae238e3db Clean up and fix generate_from_py and generate_from_xml CMake macros
Includes native-path-usage fixing like the previous commit.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
4ffc6c2882 Clean up and improve fc_copy_sources and fc_target_copy_resource CMake macros
The previous steps of TO_NATIVE_PATH followed by ABSOLUTE
is not meaningful or reliable: output of ABSOLUTE is always in
"cmake" path format, not native path format. Native path input to
CMake commands may not do what you want.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
11d89c7608 Clean up and improve "COPY_IF_DIFFERENT" CMake macro 2018-08-11 17:39:12 +02:00
Kurt Kremitzki
062fd6735b Detect OCCT at new Debian location 2018-07-11 21:13:35 -03:00
wmayer
4a80564783 fix cmake warning due to inconsistent naming 2018-05-31 13:44:03 +02:00
looooo
d38fabf264 cmake:occt: add fallback 2018-05-31 11:02:33 +02:00
looooo
432daa95c5 simplify cmake-setup of netgen and occt
using default cmake-configs to access cmake-variables
2018-05-28 14:23:05 +02:00
wmayer
271740d0aa fix version check for cmake < 3.7 2018-04-30 08:16:15 +02:00
Richard Shaw
9ec568ddfc Detect pycxx version and add source for version 7 and greater. 2018-04-29 20:56:49 +02:00
wmayer
6ac274b081 minor fixes in FindPyCXX check 2018-04-18 19:52:43 +02:00
wmayer
6858146c8a don't make existence of PySide2 mandatory 2018-04-16 13:50:38 +02:00
looooo
4ef00d7be4 workaround for netgen to use latest netgen/master 2018-02-01 21:29:25 +01:00
wmayer
df3440e698 fix possible build failure on Debian 9 2017-12-08 15:30:46 +01:00
looooo
b91e960c5c py3: /cMake gathering commits for cmake
mostly this changes are necessary to build FreeCAD with py3 (and conda) on windows.
issue 0000995
2017-06-01 19:42:13 +02:00
Markus Hovorka
36a0b5173c Honor CMAKE_INSTALL_RPATH in SET_BIN_DIR
set_target_properties used up until now in the SET_BIN_DIR macro sets
the INSTALL_RPATH property and discards whatever it contained before.
The INSTALL_RPATH target property is initialized with the cache variable
CMAKE_INSTALL_RPATH (possilbly given via the -D option of cmake). To
preserve this "default" value this commit replaced set_target_properties
with set_property(... APPEND ...).
2017-05-31 23:08:16 +02:00
Kunda
dde52952f4 source typo fixes pt1 (only on py3 merged code)
issue 0002914
2017-02-27 11:32:47 +01:00
Johannes Obermayr
7ec37c9e39 Fix RPATHS for area-native and area libs on Linux. 2017-02-10 21:09:49 +01:00
Johannes Obermayr
55160cf50d Support for NETGEN 6.2.
Upstream changed:
https://sourceforge.net/p/netgen-mesher/git/ci/7e4892a

There is also a pending request to fix NETGEN build, installation and version detection after 6.1:
https://sourceforge.net/p/netgen-mesher/git/merge-requests/1/

Just a note:
NETGEN development happens on https://gitlab.asc.tuwien.ac.at/jschoeberl/netgen but it is a very hard/strange way to find that out and get in contact with NETGEN developers as well as getting permission to fork the repository there to create a pull request.
Maybe some other developer can get in contact with NETGEN developers ...
2016-12-25 14:01:07 +01:00
Mateusz Skowroński
80e8ae63e8 Use PySide2 tools for Qt5. 2016-12-24 15:33:15 +01:00
wmayer
aba8006b95 Add cmake switch to choose between official OpenCascade version and community edition 2016-11-17 17:46:42 +01:00
Bruce B. Lacey
77cfdfffa6 Fix FindNETGEN.cmake to properly set netgen search path to HOMEBREW_PREFIX, when using homebrew, instead of the netgen cellar 2016-10-10 13:38:21 -03:00
wmayer
5e0a60b377 fix build problems with netgen under Linux 2016-09-10 19:17:37 +02:00
wmayer
d4c47c396b support of Netgen with split libraries and handle Debug & Release libraries on Windows 2016-09-04 02:46:08 +02:00
wmayer
31b905ec76 support of Netgen with split libraries 2016-09-03 19:39:51 +02:00
Johannes Obermayr
5b738f9e22 Improve NETGEN detection and support V6. 2016-07-16 17:08:05 +02:00
Bruce B. Lacey
2847b771cd Added the Open CASCADE TKCDF library required to build SMESH with OCCT7.x
and 'quiet'ed search for OpenCascade Community Edition on OS X.
2016-06-28 07:47:18 -07:00
Jean-Marie Verdun
47f21309dd FEM: Make FEM compatible with SMESH7 2016-06-15 22:34:10 +02:00
Ian Rees
27f12ae3de Find Netgen/nglib on MacOS with MacPorts 2016-03-28 10:48:49 +02:00
kkoksvik
a235cbf275 Helping cMake find pyside-uic in Arch Linux 2016-03-18 11:48:49 +01:00
wmayer
6ee243c2fa + pull request 61 2016-03-14 23:07:20 +01:00
Sergei Krivonos
7e6d816034 fixed default configuring for Gentoo
Change-Id: Iae8847950acca023a2a222404d400d3a25794be1
2015-12-26 21:22:58 +02:00
wmayer
716130c39e + fix error message in PySide check macro 2015-10-10 10:08:24 +02:00
Priit Laes
90ccc1cee4 build: Remove unused SoQt cmake scripts 2015-09-23 12:25:43 +02:00