Commit Graph

141 Commits

Author SHA1 Message Date
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
Priit Laes
e891ec1ba2 build: Remove unneeded f2c cmake scripts 2015-09-23 12:25:43 +02:00
Priit Laes
e4cf5fab49 build: Remove unneeded ODE configuration files 2015-09-23 12:25:42 +02:00
wmayer
99348d3a5b + fix cmake issue caused by patch 2015-09-11 14:47:47 +02:00
Johannes Obermayr
79ae0091ad libarea doesn't depend on parts from CMAKE_INSTALL_LIBDIR
Fixes:
 -- Installing: /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so
 CMake Error at src/Mod/Path/libarea/cmake_install.cmake:53 (file):
   file RPATH_CHANGE could not write new RPATH:

     /usr/lib64/FreeCAD/lib

   to the file:

     /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so

   No valid ELF RPATH or RUNPATH entry exists in the file;
2015-09-11 07:18:07 +02:00
Johannes Obermayr
2b9da837d7 Avoid build time on generated files from pyside-rcc and pyside-uic.
Fixes build compare:
[ 3218s] RPM file checksum differs.
[ 3218s] Extracting packages
[ 3232s] /usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py differs (Python script, ASCII text executable, with very long lines)
[ 3232s] --- old//usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py2015-01-21 20:26:34.000000000 +0000
[ 3232s] +++ new//usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py2015-01-23 11:41:24.000000000 +0000
[ 3232s] @@ -2,7 +2,7 @@
[ 3232s]
[ 3232s]  # Resource object code
[ 3232s]  #
[ 3232s] -# Created: Wed Jan 21 20:26:34 2015
[ 3232s] +# Created: Fri Jan 23 11:41:24 2015
[ 3232s]  #      by: The Resource Compiler for PySide (Qt v4.8.4)
[ 3232s]  #
[ 3232s]  # WARNING! All changes made in this file will be lost!
2015-09-11 07:18:07 +02:00
wmayer
7f9aa7b4a5 + add method to write/read BREP in binary format 2015-09-07 19:02:56 +02:00
wwmayer
059bbdc496 + write more informative error messages for missing libraries 2015-07-30 23:22:44 +02:00
wmayer
b81482d597 + harmonize Coin3D cmake variables with official check 2015-07-28 14:55:15 +02:00
wmayer
7d98705396 + harmonize XercesC cmake variables with official check 2015-07-28 14:17:49 +02:00
wmayer
51f0e99d7b + use nodefaultlib linker flag for modules 2015-07-27 11:52:19 +02:00
wmayer
b5475db2de + create MODULE libraries in given directory 2015-07-24 22:56:18 +02:00
wmayer
2bbbeaafd2 + make area build with LibPack 2015-07-24 19:23:06 +02:00