Commit Graph

110 Commits

Author SHA1 Message Date
wmayer
40883ac597 + use .dylib for normal shared libraries under MacOSX 2015-04-17 18:13:51 +02:00
Ian Rees
962bd63311 Improves build on MacOS with Homebrew or MacPorts
Squashed commit of the following:

commit e158a2049b922cead90cee4a9d3814093db8d00d
Merge: e7c5c06 d545f5b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Wed Mar 25 17:08:56 2015 +1300

    Merge branch 'mac-app-bundle' into macports-build-1

commit d545f5b0de0efa6a0fd020ac98bb6809d9254019
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 22:30:20 2015 +1300

    Minor fixes to Mac application bundle creation

commit e7c5c0630b47e89fc719259f3d81be724627f915
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:35:34 2015 +1300

    Report error if no OpenCasCADe found

commit 976b51c13a1619acf66b9d4fad5594fee292aa76
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:30:47 2015 +1300

    Detects OCE automatically on Homebrew and MacPorts

commit 1cc477f77f388f2ccb26f3884320819f8cb33249
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Mar 17 15:00:34 2015 +1300

    Find PySide and Shiboken automagically on MacPorts

commit 8bf2ebf7397a1c8c4b1b6f1d97e303f335ab47d7
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 23:05:35 2015 +1300

    Finds the Python include dir and library on OSX

commit 8bba9b2c78cfe65d7c295c4c99f0a176e1281539
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 17:31:43 2015 +1300

    Detects Python executable in MacPorts or Homebrew

commit 349a2e0e5c4d370c331bdb54d80d8f4323db8a6b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 08:25:16 2015 +1300

    Missing correct Python lib is error on cmake-ing

commit 1625fe7c1c7fb2d944b04d93be8cf90d5c829be9
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Mar 15 21:06:08 2015 +1300

    Find PySide's UIC and RCC tools properly on MacPorts
2015-04-01 14:40:34 +02:00
wmayer
63d390bc69 + improve whitespaces 2015-04-01 13:17:26 +02:00
Torsten Sadowski
b5ac41d44c Builds and runs with or without 3Dconnexion.framework on Mac
Moved on top of a clean master
2015-04-01 12:30:07 +02:00
wmayer
df3f8e4803 + start development for 0.16 2015-03-20 14:40:14 +01:00
wmayer
68875c9782 + fixes #0001984: Set CMakeLists *not* to build the useless Assembly module by default 2015-03-01 11:38:38 +01:00
Peter Lama
b52255261d Integrate script for making a relocatable OS X app 2015-02-22 18:23:10 +01:00
Yorik van Havre
15428fbb1e Disabled internal pivy building by default on non-windows platforms - fixes #1335 2015-01-25 12:17:36 -02:00
Johannes Obermayr
dfa700a6a1 Fix OCE / OCC version detection. 2014-12-20 22:41:31 +01:00
wmayer
ecc9184749 + fix package failure 2014-12-19 18:53:23 +01:00
wmayer
e99daf9bfa + set SMESH include dir when using libpack 2014-12-19 13:32:30 +01:00
wmayer
419a2853cd + revert PyCXX removal 2014-12-19 11:31:05 +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
Peter Lama
90954b06f8 Remove cmake requirement for fortran
Commit b253a148 removed the need for a fortran compiler, but cmake
was still requiring one
2014-12-18 20:14:18 -08:00
jriegel
8d98a8a064 Merge branch 'refs/heads/master' into review-CL-Bundler
Conflicts:
	src/3rdParty/salomesmesh/CMakeLists.txt
2014-11-22 13:51:04 +01:00
jriegel
17a6810518 some fixes in build with CL-Bundler 2014-11-15 21:18:22 +01:00
wmayer
c49d75a4c5 + port to CMake 3.0 2014-11-15 18:48:58 +01: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
8676ed01c3 Arch and Draft rc files are now compiled at build time - issue #1796 2014-11-05 20:07:53 -02:00
Peter Lama
be860ce264 Fix building FreeCAD with PCL
PCLConfig also calls find_package for boost, but with different
components
2014-10-29 21:36:01 -07:00
Stefan Tröger
512a2b94d2 Adaption of FreeCAD to QuarterWidget
-removes all soqtviewer references
-create a quarter adaptor class which implements missing functionality
-adopts freecad code to make use of SoRenderManager and changed View3DInventorViewer  interface
2014-09-23 10:11:11 +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
9c534e181c + allow to load PartDesign even if PySide is not found, suppress MinGW warnings 2014-08-30 23:26:29 +02:00
wmayer
880e75a5e3 + restore FREECAD_BUILD_DEBIAN to fix PPA failures 2014-08-28 13:07:09 +02:00
wmayer
4252cbc2f8 + silent pcl check, output formatting 2014-08-28 10:58:53 +02:00
wmayer
3fd87a62b4 + do pcl components checks 2014-08-28 01:51: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
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
8e373c0feb Merge remote-tracking branch 'refs/remotes/origin/wmayer/pcl-testing' into jriegel/NewWinBuild
Conflicts:
	src/Mod/Points/App/CMakeLists.txt
	src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
2014-08-26 08:42:47 +02:00
wmayer
6798c0ba22 + fix cmake configure failure 2014-08-12 17:03:01 +02:00
Sebastian Hoogen
83ff578e2b link against TKAdvTools only if OCCT < 6.7.3 2014-08-12 08:10:54 +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
Yorik van Havre
d0a612be2d Bumped version to 0.15 and added a temporary new splash 2014-07-14 20:04:21 -03:00
Sam Nelson
06443ff4e3 Moved Fortran compiler check to work with either gcc or clang compilation 2014-06-01 11:17:14 +02:00
wmayer
6ac93e9d72 Add initial support for different libdir (jobermayr) 2014-05-10 12:57:38 +02:00
wmayer
ad24c619d6 + Better support of clang, fix issues discovered by clang 2014-05-05 18:25:59 +02:00
wmayer
b0aaa05ae4 + Fix Mingw specific warning 2014-05-03 16:00:31 +02:00
wmayer
58a87f464f + Fix Mingw specific warning 2014-05-03 16:00:31 +02:00
wmayer
b7f741e744 + Option to build release version with debug information 2014-04-22 12:47:14 +02:00
wmayer
4cf15753cd + remove word 'mesh' where not needed in build options 2014-04-21 19:30:37 +02:00
wmayer
6eea89466b + fixes #0001399: Only build Salome Mesh when necessary 2014-03-15 14:02:35 +01:00
jriegel
f1d7d3f0cb remove /EHa from Windows DEBUG builds 2014-03-01 12:49:31 +01:00
jriegel
2e1a84c149 higher level exception handling on Windows 2014-02-20 22:54:30 +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
1bb1bc7257 + Copy shiboken files from LibPack 2014-01-21 11:28:58 +01:00