kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity
4,322 Commits 41 Branches 6 Tags
a5bbabdc3e1920139edbbbfe99a07cb54da0c1cd
Commit Graph

80 Commits

Author SHA1 Message Date
Sebastian Hoogen
2b01506c65 reapply changes from 6f907c3b 
avoiding to wrongly attribute the follwoing commit message to jobermayr

Thew previous commit detects the OCC/OCE version by parsing Standard_Version.hxx
using a REGEX. The result is saved as OCC_VERSION_STRING. The comparsion
VERSION_LESS requires cmake version >= 2.8.0
 2014-12-20 22:41:31 +01:00
Johannes Obermayr
f050733132 Fix OCE / OCC version detection. 2014-12-20 22:41:31 +01:00
Richard M. Shaw
a8d24be3b3 Update CMake config to work with smesh 6.5.3.1. 
New fork of standalone smesh is available here:
https://github.com/tpaviot/smesh
 2014-12-19 11:23:38 +01:00
jriegel
38fc7ba604 Merge branch 'refs/heads/master' into review-CL-Bundler 2014-11-29 15:43:19 +01:00
Michael Georg Hansen
55884f373c Print an error message if PySideTools are not found. 2014-11-28 10:55:30 -02:00
Peter Lama
f13f5dc520 Add support for CLbundler created LibPack 
* New 'UseLibPack' cmake file sets CMAKE_PREFIX_PATH so that find_package
  can be used for most packages.
* Mimic fc_wrap_cpp defined in other 'UseLibPack' files. Some file
  dependencies did not get set correctly otherwise.
* OCE 0.16 does not have Standard_ctype.hxx
* shfolder.h can't be used with Win SDK 7.0
 2014-11-14 08:01:09 -08:00
wmayer
951f440e15 + fix build failure on Windows 2014-11-07 19:59:17 +01:00
Yorik van Havre
a88038c7a0 fixed binary path in FindPysideTools cmake file - fixes #1796 2014-11-05 20:07:53 -02:00
Yorik van Havre
75deaa658f Arch and Draft rc files are now compiled at build time - issue #1796 2014-11-05 20:07:53 -02:00
jriegel
6ee9466c12 Make a new Build option for building VR support and make FindRift using the 64bit libs 2014-09-12 20:14:15 +02:00
jriegel
6c170bce18 Merge branch 'refs/heads/master' into jriegel/Rift 2014-09-12 12:27:55 +02:00
wmayer
90e3b58950 + set pcl components for LibPacks 2014-08-28 10:41:59 +02:00
wmayer
a579bdce72 + fix for pcl 1.6 2014-08-28 00:02:58 +02:00
jriegel
889e7bbdce Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/Rift 2014-08-27 17:48:59 +02:00
jriegel
e2b93c4c80 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack 2014-08-27 16:43:48 +02:00
jriegel
5bdfe81488 Destinquish old and new OpenCV 2014-08-27 16:42:50 +02:00
jriegel
c1f0f70b88 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack 
Conflicts:
	src/3rdParty/salomesmesh/CMakeLists.txt
 2014-08-27 15:39:00 +02:00
jriegel
58a7be992b Intergrate Werners PCL Triangulation patch and upgrade it to PCL 1.7 2014-08-26 10:28:37 +02:00
jriegel
4d19ec20fb Add OpenCV again and test command 2014-08-25 23:16:54 +02:00
wmayer
967566acf1 + improve OCC version macro, fix build failure with MinGW, fix build failure with Coin2 2014-08-18 11:34:02 +02:00
jriegel
ee64f54765 OCL tests 2014-08-17 20:15:12 +02:00
jriegel
fea803c2fb Changes for LibPack 10.x 2014-08-13 21:05:40 +02:00
Sebastian Hoogen
1f162dec2d link against TKAdvTools only if OCCT < 6.7.3 2014-08-12 08:10:54 +02:00
wmayer
5a33d95526 + Add macro to test and get OCC version 2014-08-10 18:52:28 +02:00
jriegel
36a0641edd App and Base Compiles with new LibPack 2014-08-03 22:56:52 +02:00
jriegel
c24a5161fc New LibPack 10 for Win 64 2014-08-03 20:37:06 +02:00
wmayer
4032a88c2d Revert "remove TKAdvTools" 
This reverts commit 6843d6ad5d.
 2014-08-01 15:07:27 +02:00
Sebastian Hoogen
6843d6ad5d remove TKAdvTools 2014-07-19 12:26:29 +02:00
jriegel
f30e86bc4b Integrating Rift Libs in build 2014-07-16 23:08:32 +02:00
wmayer
6b89c03181 Add initial support for different libdir (jobermayr) 2014-05-10 12:57:38 +02:00
mdinger
337f05d56e Move python module prefix and suffix properties into macro to be set together 2014-05-03 16:00:30 +02:00
wmayer
7be7310eb1 + fix PCH to work again with QtCreator 2014-04-30 19:04:32 +02:00
wmayer
7d42748082 + Fix PCH issue with VS 2014-04-30 14:07:27 +02:00
mdinger
f890d1d1cb Fix precompiled header build error 2014-04-30 13:41:19 +02:00
mdinger
8df9289d07 Add runtime location linux will use 2014-04-30 13:41:18 +02:00
mdinger
1f7743ad98 Disable null prefix on certain FreeCAD* targets 2014-04-30 13:41:18 +02:00
mdinger
88a3e5bf0e Add 4th optional parameter to set linux install path 2014-04-30 13:41:17 +02:00
mdinger
cb849b7f16 Macro now takes 2 parameters with a optional 3rd. Fixes linux prefix and part design install path. 2014-04-30 13:41:14 +02:00
mdinger
ed8ba118ea Send FreeCAD bins and libs to correct locations 2014-04-30 13:41:14 +02:00
mdinger
085736095e Insert SET_BIN_DIR macro everywhere except Mod 2014-04-30 13:41:12 +02:00
mdinger
d137a9ef05 Make macro to set bin directory. Apply to ANN, Pivy, and solomesmesh. 2014-04-30 13:41:11 +02:00
Marcus Brinkmann
08c36cf752 Find Coin3 header files on Fedora. 2014-03-29 12:42:28 +01:00
wmayer
006083258e + undo changes of 8b610aff on issue 0001375 because this was done in c7e41c 2014-02-10 11:23:01 +01:00
wmayer
12dbea7b90 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-02-10 10:52:42 +01:00
wmayer
8b610aff18 + fixes #0001375: FreeCAD does not support of pivy and shiboken in Libpack8.x 2014-02-10 10:52:18 +01:00
jriegel
c7e41c6150 PySide switch for LibPack >= 8.2 default on in the vanilla sourc 
This means that you need 8.2 or higher or you have to switch of FREECAD_LIBPACK_USEPYSIDE!
 2014-02-09 18:59:35 +01:00
wmayer
7cf3b61c54 + Use OCC debug libs in debug build 2014-01-08 14:28:06 +01:00
wmayer
1dcbf6a06d + Use debug versions of shiboken and PySide for MSVC debug build 2014-01-07 18:56:42 +01:00
wmayer
df363e94f3 + PySide on Windows 2013-12-09 21:58:52 +01:00
wmayer
0aa63209e8 + Simplify cmake cache 2013-12-06 18:15:54 +01:00