Commit Graph

106 Commits

Author SHA1 Message Date
Sergei Krivonos
7e6d816034 fixed default configuring for Gentoo
Change-Id: Iae8847950acca023a2a222404d400d3a25794be1
2015-12-26 21:22:58 +02:00
wmayer
716130c39e + fix error message in PySide check macro 2015-10-10 10:08:24 +02:00
Priit Laes
90ccc1cee4 build: Remove unused SoQt cmake scripts 2015-09-23 12:25:43 +02:00
Priit Laes
e891ec1ba2 build: Remove unneeded f2c cmake scripts 2015-09-23 12:25:43 +02:00
Priit Laes
e4cf5fab49 build: Remove unneeded ODE configuration files 2015-09-23 12:25:42 +02:00
wmayer
99348d3a5b + fix cmake issue caused by patch 2015-09-11 14:47:47 +02:00
Johannes Obermayr
79ae0091ad libarea doesn't depend on parts from CMAKE_INSTALL_LIBDIR
Fixes:
 -- Installing: /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so
 CMake Error at src/Mod/Path/libarea/cmake_install.cmake:53 (file):
   file RPATH_CHANGE could not write new RPATH:

     /usr/lib64/FreeCAD/lib

   to the file:

     /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so

   No valid ELF RPATH or RUNPATH entry exists in the file;
2015-09-11 07:18:07 +02:00
Johannes Obermayr
2b9da837d7 Avoid build time on generated files from pyside-rcc and pyside-uic.
Fixes build compare:
[ 3218s] RPM file checksum differs.
[ 3218s] Extracting packages
[ 3232s] /usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py differs (Python script, ASCII text executable, with very long lines)
[ 3232s] --- old//usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py2015-01-21 20:26:34.000000000 +0000
[ 3232s] +++ new//usr/lib64/FreeCAD/Mod/Arch/Arch_rc.py2015-01-23 11:41:24.000000000 +0000
[ 3232s] @@ -2,7 +2,7 @@
[ 3232s]
[ 3232s]  # Resource object code
[ 3232s]  #
[ 3232s] -# Created: Wed Jan 21 20:26:34 2015
[ 3232s] +# Created: Fri Jan 23 11:41:24 2015
[ 3232s]  #      by: The Resource Compiler for PySide (Qt v4.8.4)
[ 3232s]  #
[ 3232s]  # WARNING! All changes made in this file will be lost!
2015-09-11 07:18:07 +02:00
wmayer
7f9aa7b4a5 + add method to write/read BREP in binary format 2015-09-07 19:02:56 +02:00
wwmayer
059bbdc496 + write more informative error messages for missing libraries 2015-07-30 23:22:44 +02:00
wmayer
b81482d597 + harmonize Coin3D cmake variables with official check 2015-07-28 14:55:15 +02:00
wmayer
7d98705396 + harmonize XercesC cmake variables with official check 2015-07-28 14:17:49 +02:00
wmayer
51f0e99d7b + use nodefaultlib linker flag for modules 2015-07-27 11:52:19 +02:00
wmayer
b5475db2de + create MODULE libraries in given directory 2015-07-24 22:56:18 +02:00
wmayer
2bbbeaafd2 + make area build with LibPack 2015-07-24 19:23:06 +02:00
wmayer
36249a64ce + use variables instead of hard-coded library names 2015-07-17 14:54:02 +02:00
wmayer
74e397c869 + eliminate cmake variable QT_QTCORE_LIBRARY_DEBUG 2015-07-17 11:33:49 +02:00
wmayer
bb9f43746f + eliminate cmake variable Boost_DEBUG_LIBRARIES 2015-07-17 11:05:25 +02:00
wmayer
40cd060c5b + replace PYTHON_LIBRARY with correct variable PYTHON_LIBRARIES 2015-07-16 19:29:56 +02:00
wmayer
0b1da87302 + eliminate cmake variable QT_DEBUG_LIBRARIES 2015-07-16 19:06:20 +02:00
wmayer
62c6a61b8b + fix cmake variables related to debug/release libraries of Qt 2015-07-15 13:33:31 +02:00
wmayer
59e45e0ae9 + use .dylib for normal shared libraries under MacOSX 2015-04-17 18:13:51 +02:00
Ian Rees
ccfaa56b31 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
Peter Lama
7fa9919442 Add python bin dir as hint for finding PySide tools
(On OS X and Windows)

This should handle most situations
2015-02-21 20:08:56 -08:00
Peter Lama
32dd867a30 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
5478c0fdfe + fixes #0001872: HAVE_CONFIG_H regression 2014-12-22 10:24:26 +01:00
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