suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,453 Commits 6 Branches 5 Tags 533 MiB
patch-print-radius
Commit Graph

121 Commits

Author SHA1 Message Date
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
wmayer
66387458a7 + fixes #0001081 2013-11-10 14:26:30 +01:00
wmayer
6b7d1856e2 + Disable downloading coin.tag file if doc package is not installed 2013-10-26 09:54:25 +02:00
wmayer
f061b6f7ea 0001278: No build possible with current CMake version 2.8.12 2013-10-22 10:33:18 +02:00
wmayer
aaae09b5ea Fix CMake test for PyCXX 2013-07-15 12:02:04 +02:00
wmayer
3e5168a0c1 0000964: Patch to allow use of external PyCXX 2013-07-13 16:25:16 +02:00
wmayer
7533517bb2 0001021: add directory to findCoin cmake 2013-07-01 14:03:45 +02:00
wmayer
32117fb980 Prepare Windows build to use FreeType 2013-06-11 17:28:21 +02:00
wmayer
97dd5fd059 Pass argument to moc to fix problem with boost 2013-05-27 11:13:32 +02:00
wmayer
4dc31c4d80 Move TKMeshVS & TKAdvTools to OCC_OCAF_LIBRARIES variable 2013-04-01 23:13:51 +02:00
wmayer
8b0bf33344 Disable NetgenPlugin for gcc and mingw 2013-04-01 17:40:52 +02:00
jriegel
7bedde5b4f Remove Salomemesh from LibPack and compile with source. Changes for LibPack 8.1 
Had to overwrite the salomemesh in 3rdParty with the original 5.1.2.2 from sf.net since through layout changes imposible to merge or even see changes in the code. Linux tweaking has to be done..
 2013-03-31 00:16:25 +01:00
jriegel
60c4b3ecc4 Treat OCE in LibPack8.x with respect to debug/release 2013-03-31 00:16:17 +01:00
wmayer
c70a39c961 Minor repairs per jriegel/jmaustpc (fixes from wandererfan) 2013-03-30 13:42:30 +01:00
WandererFan
8b2c763e4a Basic ASCII text to wire version. Breaks on Unicode. std::exception handling. 2013-03-16 17:07:05 -04:00
wmayer
ccdbd4e65e Extend search paths to find OCC headers with cmake 2013-02-14 17:41:08 +01:00
Jose Luis Cercos Pita
2087f76b8d Removed decimal version converter due to unexpectable versions 2012-10-29 20:54:08 +01:00
Jose Luis Cercos Pita
b90185c842 Re-Created branch form 0, to avoid conflicts 2012-10-29 10:30:17 +01:00
wmayer
1933093e71 Fix build problems with ImportGui module, fix bug in Draft when using texture image 2012-10-05 12:19:07 +02:00
wmayer
aa72516fbe Use variable OCC_OCAF_LIBRARIES for OCAF libs 2012-10-01 13:16:07 +02:00
wmayer
d8d7fcca34 0000651: FindCoin3D should look in /usr/include/Coin3 for COIN3D_INCLUDE_DIR 2012-09-29 18:23:04 +02:00
wmayer
4ffaecbdbf Extend search path for Coin cmake test 2012-09-26 14:40:12 +02:00
wmayer
549f4dfa26 Add TKFeat to OCC_LIBRARIES 2012-08-29 16:34:31 +02:00
wmayer
a9ad8068a8 Add TKFeat to OCC_LIBRARIES 2012-07-09 13:37:11 +02:00
wmayer
920fc39999 Add TKFeat 2012-07-02 15:40:08 +02:00
jriegel
0e1d4fb8cd Add LibPack 8.x detection from Assembly 2012-06-10 10:26:57 +02:00
wmayer
5f140253fa Support of INSTALL target on Windows (VC++ and MinGW) 2012-02-17 21:41:00 +01:00
wmayer
de66587251 0000520: CMake configuration tweaks 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5269 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
 2011-12-11 11:45:34 +00:00
wmayer
23164bfa1a 0000534: cmake error 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5263 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
 2011-12-10 21:56:16 +00:00
wmayer
d5655a9e1d 0000520: CMake configuration tweaks 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5259 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
 2011-12-10 19:26:44 +00:00
wmayer
120ca87015 + unify DLL export defines to namespace names 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5000 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
 2011-10-10 13:44:52 +00:00