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 |
|
wmayer
|
8a923bac76
|
+ PySide on Windows
|
2013-12-09 21:58:52 +01:00 |
|
wmayer
|
77cd699e8c
|
+ Simplify cmake cache
|
2013-12-06 18:15:54 +01:00 |
|
wmayer
|
ee94683af4
|
+ fixes #0001081
|
2013-11-10 14:26:30 +01:00 |
|
wmayer
|
ed110ee365
|
+ Disable downloading coin.tag file if doc package is not installed
|
2013-10-26 09:54:25 +02:00 |
|
wmayer
|
201042692d
|
0001278: No build possible with current CMake version 2.8.12
|
2013-10-22 10:33:18 +02:00 |
|
wmayer
|
b7e53b4514
|
Fix CMake test for PyCXX
|
2013-07-15 12:02:04 +02:00 |
|
wmayer
|
a809a804f2
|
0000964: Patch to allow use of external PyCXX
|
2013-07-13 16:25:16 +02:00 |
|
wmayer
|
d78d5783c4
|
0001021: add directory to findCoin cmake
|
2013-07-01 14:03:45 +02:00 |
|
wmayer
|
6c1c33f568
|
Prepare Windows build to use FreeType
|
2013-06-11 17:28:21 +02:00 |
|
wmayer
|
9a692545fc
|
Pass argument to moc to fix problem with boost
|
2013-05-27 11:13:32 +02:00 |
|
wmayer
|
83a8002463
|
Move TKMeshVS & TKAdvTools to OCC_OCAF_LIBRARIES variable
|
2013-04-01 23:13:51 +02:00 |
|