kindred/create
1
1
Fork 0
Code Issues 42 Pull Requests Actions 3 Packages Projects 9 Releases 2 Wiki Activity
4,510 Commits 40 Branches 6 Tags
7eaf6cba47a3fc8a0ee01ab0992eb0f6c19ed983
Commit Graph

82 Commits

Author SHA1 Message Date
Peter Lama
0428584eb3 Fix duplicate 'optimized' when using new libpack 
When using a CLbundler libpack, PYTHON_LIBRARY has both optimized and debug
libs, but it doesn't when using an old libpack, which was the reason for
commit f5a4e680
 2014-12-28 19:04:31 -08:00
wmayer
1244603ea9 + fixes #0001872: HAVE_CONFIG_H regression 2014-12-22 10:24:26 +01:00
Sebastian Hoogen
f767825f0a 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
dfa700a6a1 Fix OCE / OCC version detection. 2014-12-20 22:41:31 +01:00
Richard M. Shaw
d5e8ae2d05 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
58411cbbd3 Merge branch 'refs/heads/master' into review-CL-Bundler 2014-11-29 15:43:19 +01:00
Michael Georg Hansen
d276d62342 Print an error message if PySideTools are not found. 2014-11-28 10:55:30 -02:00
Peter Lama
7d30188d01 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
b3974a7a2b + fix build failure on Windows 2014-11-07 19:59:17 +01:00
Yorik van Havre
7ad85db019 fixed binary path in FindPysideTools cmake file - fixes #1796 2014-11-05 20:07:53 -02:00
Yorik van Havre
8676ed01c3 Arch and Draft rc files are now compiled at build time - issue #1796 2014-11-05 20:07:53 -02:00
jriegel
2fd6612991 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
a73050e934 Merge branch 'refs/heads/master' into jriegel/Rift 2014-09-12 12:27:55 +02:00
wmayer
773a6d1d4d + set pcl components for LibPacks 2014-08-28 10:41:59 +02:00
wmayer
c043ec75d9 + fix for pcl 1.6 2014-08-28 00:02:58 +02:00
jriegel
7d3760742f Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/Rift 2014-08-27 17:48:59 +02:00
jriegel
0e4c78f917 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack 2014-08-27 16:43:48 +02:00
jriegel
206970bad8 Destinquish old and new OpenCV 2014-08-27 16:42:50 +02:00
jriegel
d0d832896a 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
9a431e2b20 Intergrate Werners PCL Triangulation patch and upgrade it to PCL 1.7 2014-08-26 10:28:37 +02:00
jriegel
abf6a978ae Add OpenCV again and test command 2014-08-25 23:16:54 +02:00
wmayer
222bcf39c4 + improve OCC version macro, fix build failure with MinGW, fix build failure with Coin2 2014-08-18 11:34:02 +02:00
jriegel
0d3db11327 OCL tests 2014-08-17 20:15:12 +02:00
jriegel
1639a7736a Changes for LibPack 10.x 2014-08-13 21:05:40 +02:00
Sebastian Hoogen
83ff578e2b link against TKAdvTools only if OCCT < 6.7.3 2014-08-12 08:10:54 +02:00
wmayer
e678de5f49 + Add macro to test and get OCC version 2014-08-10 18:52:28 +02:00
jriegel
cf229654aa App and Base Compiles with new LibPack 2014-08-03 22:56:52 +02:00
jriegel
d92a859ee3 New LibPack 10 for Win 64 2014-08-03 20:37:06 +02:00
wmayer
52b3217a73 Revert "remove TKAdvTools" 
This reverts commit 6843d6ad5d.
 2014-08-01 15:07:27 +02:00
Sebastian Hoogen
3497928c41 remove TKAdvTools 2014-07-19 12:26:29 +02:00
jriegel
5257b6a8a9 Integrating Rift Libs in build 2014-07-16 23:08:32 +02:00
wmayer
6ac93e9d72 Add initial support for different libdir (jobermayr) 2014-05-10 12:57:38 +02:00
mdinger
1498e99cef Move python module prefix and suffix properties into macro to be set together 2014-05-03 16:00:30 +02:00
wmayer
2bb8a2d9a6 + fix PCH to work again with QtCreator 2014-04-30 19:04:32 +02:00
wmayer
e799982a80 + Fix PCH issue with VS 2014-04-30 14:07:27 +02:00
mdinger
f53989e7a6 Fix precompiled header build error 2014-04-30 13:41:19 +02:00
mdinger
2044445995 Add runtime location linux will use 2014-04-30 13:41:18 +02:00
mdinger
df0303af32 Disable null prefix on certain FreeCAD* targets 2014-04-30 13:41:18 +02:00
mdinger
7982ffe726 Add 4th optional parameter to set linux install path 2014-04-30 13:41:17 +02:00
mdinger
55685e0ed3 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
4a62f4fcfa Send FreeCAD bins and libs to correct locations 2014-04-30 13:41:14 +02:00
mdinger
37d6b55008 Insert SET_BIN_DIR macro everywhere except Mod 2014-04-30 13:41:12 +02:00
mdinger
553ea9958b Make macro to set bin directory. Apply to ANN, Pivy, and solomesmesh. 2014-04-30 13:41:11 +02:00
Marcus Brinkmann
8525fae12b Find Coin3 header files on Fedora. 2014-03-29 12:42:28 +01:00
wmayer
9e8f124af7 + undo changes of 8b610aff on issue 0001375 because this was done in c7e41c 2014-02-10 11:23:01 +01:00
wmayer
e9f3ce1d24 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-02-10 10:52:42 +01:00
wmayer
f6c950e953 + fixes #0001375: FreeCAD does not support of pivy and shiboken in Libpack8.x 2014-02-10 10:52:18 +01:00
jriegel
a1af077d49 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
9fea6b75eb + Use OCC debug libs in debug build 2014-01-08 14:28:06 +01:00
wmayer
54c738f5d1 + Use debug versions of shiboken and PySide for MSVC debug build 2014-01-07 18:56:42 +01:00