rpms/VirtualBox/F-17 .cvsignore, 1.35, 1.36 Makefile, 1.3, 1.4 VirtualBox.spec, 1.6, 1.7 sources, 1.35, 1.36
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12221
Modified Files:
.cvsignore Makefile VirtualBox.spec sources
Log Message:
* Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1
- New upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 31 May 2012 05:02:21 -0000 1.35
+++ .cvsignore 8 Jul 2012 14:44:53 -0000 1.36
@@ -1 +1 @@
-VirtualBox-4.1.16.tar.bz2
+VirtualBox-4.1.18.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox.spec 16 Jun 2012 15:28:15 -0000 1.6
+++ VirtualBox.spec 8 Jul 2012 14:44:53 -0000 1.7
@@ -14,8 +14,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
-Version: 4.1.16
-Release: 6%{?prerel:.%{prerel}}%{?dist}
+Version: 4.1.18
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -46,13 +46,6 @@
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-OSE-4.1.10-mesa.patch
-###
-#Upstream patches
-%if 0%{?fedora} > 17
-Patch100: VirtualBox-changeset_41660.patch
-Patch101: VirtualBox-changeset_41577.patch
-%endif
-
%if 0%{?fedora} < 17
BuildRequires: kBuild >= 0.1.98
%endif
@@ -182,12 +175,6 @@
%setup -q
find -name '*.py[co]' -delete
-# upstream patches first
-%if 0%{?fedora} > 17
-%patch100 -p1 -b .kernel35
-%patch101 -p1 -b .kernel35.2
-%endif
-
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
@@ -564,8 +551,8 @@
%changelog
-* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-6
-- Don't need patch10x in F17 or minor relverisons.
+* Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1
+- New upstream release.
* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-5
- Kernel patches just for rawhide, so we don't need recompile kmods.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 31 May 2012 05:02:21 -0000 1.35
+++ sources 8 Jul 2012 14:44:53 -0000 1.36
@@ -1 +1 @@
-eacfb802ecdd6d3435228eb3d3488719 VirtualBox-4.1.16.tar.bz2
+38db0a87cba659b484af868b0c2bd3ac VirtualBox-4.1.18.tar.bz2
12 years, 4 months
- 1
- 0
rpms/gmameui/F-16 .cvsignore, 1.4, 1.5 gmameui.spec, 1.4, 1.5 sources, 1.4, 1.5
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31982
Modified Files:
.cvsignore gmameui.spec sources
Log Message:
* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
gmamui relies on some old gnome-icons-theme, cleans icons errors.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 6 Jul 2012 23:06:52 -0000 1.4
+++ .cvsignore 7 Jul 2012 19:28:21 -0000 1.5
@@ -1 +1,2 @@
gmameui-gmameui20120704cvs.tar.gz
+missingicons.tbz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/gmameui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gmameui.spec 6 Jul 2012 23:06:53 -0000 1.4
+++ gmameui.spec 7 Jul 2012 19:28:21 -0000 1.5
@@ -1,12 +1,14 @@
Summary: Frontend for MAME
Name: gmameui
Version: 0.2.13
-Release: 0.1.20120704cvs%{?dist}
+Release: 0.2.20120704cvs%{?dist}
License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
Source0: gmameui-gmameui20120704cvs.tar.gz
+#from gnome-icon-theme-gperfection2-2.3-1.noarch.rpm
+Source1: missingicons.tbz
Patch0: gmameui-0.2.12-fix.patch
Patch2: gmameui-fix3.patch
Patch3: gmameui-fix4.patch
@@ -32,6 +34,7 @@
%prep
%setup -q -n gmameui
+%setup -a1 -qn gmameui
%patch0 -p1 -b .fix
%patch2 -p0 -b .fix3
%patch3 -p0 -b .fix4
@@ -53,6 +56,13 @@
%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
+# Install missing icons
+#%{__cp} emblem-distinguished.png emblem-sound.png stock_unknown.png stock_filter-navigator.png \
+#stock_toggle-preview.png stock_list_enum-off.png %{buildroot}%{_datadir}/gmameui/
+
+%{__cp} gmameui-view-list.png gmameui-view-filters.png gmameui-view-screenshot.png \
+gmameui-emblem-unknown.png gmameui-emblem-played.png gmameui-emblem-sound.png \
+%{buildroot}%{_datadir}/gmameui/
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -67,6 +77,10 @@
%changelog
+* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
+- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
+ gmamui relies on some old gnome-icons-theme, cleans icons errors.
+
* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec :
- Updated the license tag to GPLv3+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-16/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 6 Jul 2012 23:06:53 -0000 1.4
+++ sources 7 Jul 2012 19:28:21 -0000 1.5
@@ -1 +1,2 @@
10ecddacd3239b395f84bd034bc5531e gmameui-gmameui20120704cvs.tar.gz
+ccc3410c5885692bc7b28a27fce3e9f6 missingicons.tbz
12 years, 4 months
- 1
- 0
rpms/mythtv/F-16 mythtv-0.25.1-php54.patch, NONE, 1.1 mythtv.spec, 1.94, 1.95
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19948
Modified Files:
mythtv.spec
Added Files:
mythtv-0.25.1-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.
mythtv-0.25.1-php54.patch:
MythBase.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythtv-0.25.1-php54.patch ---
commit cd670ec7bf5f04f1ba67b5a7cbc00374479eb9b0
Author: Chris Petersen <cpetersen(a)mythtv.org>
Date: Wed Jun 13 21:01:18 2012 -0700
Partial support for PHP 5.4
Bindings portions of the patch re #10504
diff --git a/mythtv/bindings/php/MythBase.php b/mythtv/bindings/php/MythBase.php
index 9b41efc..563e6fb 100644
--- a/mythtv/bindings/php/MythBase.php
+++ b/mythtv/bindings/php/MythBase.php
@@ -47,7 +47,7 @@ class MythBase {
public function __destruct() {
if (!is_null($this->cacheKey))
- Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
+ Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
$this->cacheKey = null;
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/mythtv.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mythtv.spec 6 Jul 2012 00:46:08 -0000 1.94
+++ mythtv.spec 7 Jul 2012 16:47:16 -0000 1.95
@@ -82,7 +82,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -137,6 +137,9 @@
Patch0: mythtv-0.25.1-fixes.patch
+# Fixes for PHP 5.4
+Patch1: mythtv-0.25.1-php54.patch
+
Source10: PACKAGE-LICENSING
Source11: ChangeLog
Source101: mythbackend.sysconfig
@@ -806,6 +809,7 @@
fi
%patch0 -p1 -b .mythtv
+%patch1 -p1 -b .php54
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1433,6 +1437,9 @@
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
+- Patch for PHP 5.4 warnings.
+
* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
- Update to latest fixes/0.25.
- Move mythweb to a stand alone package.
12 years, 4 months
- 1
- 0
rpms/mythtv/F-17 mythtv-0.25.1-php54.patch, NONE, 1.1 mythtv.spec, 1.96, 1.97
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19700
Modified Files:
mythtv.spec
Added Files:
mythtv-0.25.1-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.
mythtv-0.25.1-php54.patch:
MythBase.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythtv-0.25.1-php54.patch ---
commit cd670ec7bf5f04f1ba67b5a7cbc00374479eb9b0
Author: Chris Petersen <cpetersen(a)mythtv.org>
Date: Wed Jun 13 21:01:18 2012 -0700
Partial support for PHP 5.4
Bindings portions of the patch re #10504
diff --git a/mythtv/bindings/php/MythBase.php b/mythtv/bindings/php/MythBase.php
index 9b41efc..563e6fb 100644
--- a/mythtv/bindings/php/MythBase.php
+++ b/mythtv/bindings/php/MythBase.php
@@ -47,7 +47,7 @@ class MythBase {
public function __destruct() {
if (!is_null($this->cacheKey))
- Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
+ Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
$this->cacheKey = null;
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mythtv.spec 5 Jul 2012 22:30:47 -0000 1.96
+++ mythtv.spec 7 Jul 2012 16:46:17 -0000 1.97
@@ -82,7 +82,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -137,6 +137,9 @@
Patch0: mythtv-0.25.1-fixes.patch
+# Fixes for PHP 5.4
+Patch1: mythtv-0.25.1-php54.patch
+
Source10: PACKAGE-LICENSING
Source11: ChangeLog
Source101: mythbackend.sysconfig
@@ -806,6 +809,7 @@
fi
%patch0 -p1 -b .mythtv
+%patch1 -p1 -b .php54
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1433,6 +1437,9 @@
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
+- Patch for PHP 5.4 warnings.
+
* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
- Update to latest fixes/0.25.
- Move mythweb to a stand alone package.
12 years, 4 months
- 1
- 0
rpms/gmameui/F-17 .cvsignore, 1.5, 1.6 gmameui.spec, 1.7, 1.8 sources, 1.5, 1.6
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10111
Modified Files:
.cvsignore gmameui.spec sources
Log Message:
* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
gmamui relies on some old gnome-icons-theme, cleans icons errors.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 6 Jul 2012 23:03:29 -0000 1.5
+++ .cvsignore 7 Jul 2012 14:40:02 -0000 1.6
@@ -1 +1,2 @@
gmameui-gmameui20120704cvs.tar.gz
+missingicons.tbz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/gmameui.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gmameui.spec 6 Jul 2012 23:03:29 -0000 1.7
+++ gmameui.spec 7 Jul 2012 14:40:03 -0000 1.8
@@ -1,12 +1,14 @@
Summary: Frontend for MAME
Name: gmameui
Version: 0.2.13
-Release: 0.1.20120704cvs%{?dist}
+Release: 0.2.20120704cvs%{?dist}
License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
Source0: gmameui-gmameui20120704cvs.tar.gz
+#from gnome-icon-theme-gperfection2-2.3-1.noarch.rpm
+Source1: missingicons.tbz
Patch0: gmameui-0.2.12-fix.patch
Patch2: gmameui-fix3.patch
Patch3: gmameui-fix4.patch
@@ -32,6 +34,7 @@
%prep
%setup -q -n gmameui
+%setup -a1 -qn gmameui
%patch0 -p1 -b .fix
%patch2 -p0 -b .fix3
%patch3 -p0 -b .fix4
@@ -53,6 +56,13 @@
%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
+# Install missing icons
+#%{__cp} emblem-distinguished.png emblem-sound.png stock_unknown.png stock_filter-navigator.png \
+#stock_toggle-preview.png stock_list_enum-off.png %{buildroot}%{_datadir}/gmameui/
+
+%{__cp} gmameui-view-list.png gmameui-view-filters.png gmameui-view-screenshot.png \
+gmameui-emblem-unknown.png gmameui-emblem-played.png gmameui-emblem-sound.png \
+%{buildroot}%{_datadir}/gmameui/
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -67,6 +77,10 @@
%changelog
+* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
+- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
+ gmamui relies on some old gnome-icons-theme, cleans icons errors.
+
* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec :
- Updated the license tag to GPLv3+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/F-17/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 6 Jul 2012 23:03:29 -0000 1.5
+++ sources 7 Jul 2012 14:40:03 -0000 1.6
@@ -1 +1,2 @@
10ecddacd3239b395f84bd034bc5531e gmameui-gmameui20120704cvs.tar.gz
+ccc3410c5885692bc7b28a27fce3e9f6 missingicons.tbz
12 years, 4 months
- 1
- 0
rpms/mythtv/devel mythtv-0.25.1-php54.patch, NONE, 1.1 mythtv.spec, 1.98, 1.99
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7009
Modified Files:
mythtv.spec
Added Files:
mythtv-0.25.1-php54.patch
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.
mythtv-0.25.1-php54.patch:
MythBase.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythtv-0.25.1-php54.patch ---
commit cd670ec7bf5f04f1ba67b5a7cbc00374479eb9b0
Author: Chris Petersen <cpetersen(a)mythtv.org>
Date: Wed Jun 13 21:01:18 2012 -0700
Partial support for PHP 5.4
Bindings portions of the patch re #10504
diff --git a/mythtv/bindings/php/MythBase.php b/mythtv/bindings/php/MythBase.php
index 9b41efc..563e6fb 100644
--- a/mythtv/bindings/php/MythBase.php
+++ b/mythtv/bindings/php/MythBase.php
@@ -47,7 +47,7 @@ class MythBase {
public function __destruct() {
if (!is_null($this->cacheKey))
- Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
+ Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
$this->cacheKey = null;
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mythtv.spec 5 Jul 2012 18:07:33 -0000 1.98
+++ mythtv.spec 7 Jul 2012 13:56:34 -0000 1.99
@@ -82,7 +82,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -137,6 +137,9 @@
Patch0: mythtv-0.25.1-fixes.patch
+# Fixes for PHP 5.4
+Patch1: mythtv-0.25.1-php54.patch
+
Source10: PACKAGE-LICENSING
Source11: ChangeLog
Source101: mythbackend.sysconfig
@@ -806,6 +809,7 @@
fi
%patch0 -p1 -b .mythtv
+%patch1 -p1 -b .php54
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1433,6 +1437,9 @@
%changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
+- Patch for PHP 5.4 warnings.
+
* Tue Jun 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-1
- Update to latest fixes/0.25.
- Move mythweb to a stand alone package.
12 years, 4 months
- 1
- 0
rpms/freecad/F-16 freecad-0.12-OpenCASCADE-option.patch, NONE, 1.1 freecad-0.12-pycxx.patch, NONE, 1.1 freecad-0.12-rm_f2c.patch, NONE, 1.1 freecad-0.12-zipios.patch, NONE, 1.1 freecad-3rdParty.patch, NONE, 1.1 freecad-StartPage.patch, NONE, 1.1 freecad-cmake_Mod_fix.patch, NONE, 1.1 freecad-gcc-4.7.patch, NONE, 1.1 freecad-glu.patch, NONE, 1.1 freecad-system_inst.patch, NONE, 1.1 freecad.1, NONE, 1.1 freecad.desktop, NONE, 1.1 freecad.spec, NONE, 1.1 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/freecad/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6427
Modified Files:
sources
Added Files:
freecad-0.12-OpenCASCADE-option.patch freecad-0.12-pycxx.patch
freecad-0.12-rm_f2c.patch freecad-0.12-zipios.patch
freecad-3rdParty.patch freecad-StartPage.patch
freecad-cmake_Mod_fix.patch freecad-gcc-4.7.patch
freecad-glu.patch freecad-system_inst.patch freecad.1
freecad.desktop freecad.spec
Log Message:
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
freecad-0.12-OpenCASCADE-option.patch:
CMakeLists.txt | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
--- NEW FILE freecad-0.12-OpenCASCADE-option.patch ---
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-24 01:14:02.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-24 01:18:52.000000000 -0500
@@ -163,15 +163,20 @@
#first, look for OpenCASCADE Community Edition (OCE)
#if OCE is installed in a nonstandard location, add -DOCE_DIR=/path/to/dir/containing/OCEConfig.cmake
# when configuring with cmake, i.e. cmake .. -DOCE_DIR=/usr/share/cmake
- if( NOT DEFINED OCE_DIR )
- if( UNIX )
- set( OCE_DIR "/usr/local/share/cmake/" )
- else()
- set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ if( NOT DEFINED USE_OCC )
+ if( NOT DEFINED OCE_DIR )
+ if( UNIX )
+ set( OCE_DIR "/usr/local/share/cmake/" )
+ else()
+ set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ endif()
endif()
+ find_package ( OCE )
+ else()
+ set(OCE_FOUND FALSE)
+
endif()
- find_package ( OCE )
- if( ${OCE_FOUND} )
+ if( ${OCE_FOUND} AND NOT DEFINED USE_OCC )
message("-- OpenCASCADE Community Edition has been found.")
add_definitions ( -DHAVE_CONFIG_H )
set( OCC_LIBRARIES "TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
freecad-0.12-pycxx.patch:
CMakeLists.txt | 12 +++++
cMake/FindPyCXX.cmake | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
src/Base/CMakeLists.txt | 21 ++-------
3 files changed, 124 insertions(+), 16 deletions(-)
--- NEW FILE freecad-0.12-pycxx.patch ---
This patch adds an option to FreeCAD's cmake to specify an external
PyCXX. PyCXX doesn't really have a standard location, so this will try
to guess a couple of places, but best is to specify on the cmake command
line:
cmake -DPYCXX_INCLUDE_DIR=/usr/include/python2.7 \
-DPYCXX_SOURCE_DIR=/usr/share/python2.7/CXX
diff -ruN FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-25 01:32:19.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-25 01:30:48.000000000 -0500
@@ -86,6 +86,13 @@
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
+SET(PYCXX_INCLUDE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src" CACHE PATH
+ "Path to the directory containing PyCXX's CXX/Config.hxx include file")
+SET(PYCXX_SOURCE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src/CXX" CACHE PATH
+ "Path to the directory containing PyCXX's cxxextensions.c source file")
+
# ==============================================================================
@@ -158,6 +165,11 @@
find_package(ZLIB REQUIRED)
+# -------------------------------- PyCXX --------------------------------
+
+ find_package(PyCXX REQUIRED)
+
+
# -------------------------------- OpenCasCade --------------------------------
#first, look for OpenCASCADE Community Edition (OCE)
diff -ruN FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake FreeCAD-0.12.5284/cMake/FindPyCXX.cmake
--- FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake 1969-12-31 18:00:00.000000000 -0600
+++ FreeCAD-0.12.5284/cMake/FindPyCXX.cmake 2012-06-25 01:30:25.000000000 -0500
@@ -0,0 +1,107 @@
+# Locate PyCXX headers and source files
+
+# This module defines
+# PYCXX_INCLUDE_DIR
+# PYCXX_SOURCE_DIR
+# PYCXX_FOUND
+# PYCXX_SOURCES
+#
+# The PYCXX_*_DIR variables can be set to tell this module where
+# the files are.
+
+
+# There's no standard location for PyCXX.
+#
+# The authors' example is to put it in "~\" [sic].
+#
+# Ubuntu puts the includes into /usr/include/python2.7/CXX and sources into
+# /usr/share/python2.7/CXX.
+#
+# The Zultron Fedora RPM does the same as Ubuntu.
+
+set(PYCXX_FOUND "YES")
+
+# find the header directory
+if(PYCXX_INCLUDE_DIR)
+ # headers better be in there
+ if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+else(PYCXX_INCLUDE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_INCLUDE_DIR CXX/Config.hxx
+ ${PYTHON_INCLUDE_DIR}
+ "${CMAKE_CURRENT_LIST_DIR}/..")
+ if(NOT PYCXX_INCLUDE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
+ "the location of CXX/Config.hxx")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_INCLUDE_DIR)
+endif(PYCXX_INCLUDE_DIR)
+
+# find the sources directory
+if(PYCXX_SOURCE_DIR)
+ # source directory specified, they'd better be there
+ if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+else(PYCXX_SOURCE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_SOURCE_DIR cxxextensions.c
+ "${PYCXX_INCLUDE_DIR}/CXX"
+ "${PYCXX_INCLUDE_DIR}/Src"
+ "${PYTHON_INCLUDE_DIR}/CXX"
+ "${PYTHON_INCLUDE_DIR}/Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../CXX")
+ if(NOT PYCXX_SOURCE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_SOURCE_DIR to "
+ "the location of cxxextensions.c")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_SOURCE_DIR)
+endif(PYCXX_SOURCE_DIR)
+
+# see what we've got
+if(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX found:")
+ MESSAGE(STATUS " Headers: ${PYCXX_INCLUDE_DIR}")
+ MESSAGE(STATUS " Sources: ${PYCXX_SOURCE_DIR}")
+
+ # Build the list of sources for convenience
+ set(PYCXX_SOURCES
+ ${PYCXX_SOURCE_DIR}/cxxextensions.c
+ ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
+ ${PYCXX_SOURCE_DIR}/cxxsupport.cxx
+ ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
+ )
+else(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX not found")
+endif(PYCXX_FOUND)
diff -ruN FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-06-25 01:32:18.000000000 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-06-25 01:31:09.000000000 -0500
@@ -121,21 +121,6 @@
)
SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
-SET(pycxx_SRCS
- ../CXX/Config.hxx
- ../CXX/cxxextensions.c
- ../CXX/cxx_extensions.cxx
- ../CXX/cxxsupport.cxx
- ../CXX/Exception.hxx
- ../CXX/Extensions.hxx
- ../CXX/IndirectPythonInterface.cxx
- ../CXX/IndirectPythonInterface.hxx
- ../CXX/Objects.hxx
- ../CXX/Version.hxx
- ../CXX/WrapPython.h
-)
-SOURCE_GROUP("pycxx" FILES ${pycxx_SRCS})
-
SET(FreeCADBase_XML_SRCS
BaseClassPy.xml
BoundBoxPy.xml
@@ -269,7 +254,6 @@
)
SET(FreeCADBase_SRCS
- ${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
${FreeCADBase_XML_SRCS}
@@ -301,6 +285,11 @@
endif(USE_EXTERNAL_ZIPIOS)
+include_directories(${PYCXX_INCLUDE_DIR})
+list(APPEND FreeCADBase_SRCS ${PYCXX_SOURCES})
+SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES})
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-0.12-rm_f2c.patch:
CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
--- NEW FILE freecad-0.12-rm_f2c.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-07-05 08:47:37.921080779 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-07-05 15:28:53.615339177 -0500
@@ -204,12 +204,6 @@
ENDIF()
endif()
-# -------------------------------- f2c ----------------------------------
-
- IF(OCC_FOUND)
- find_package(F2C REQUIRED)
- ENDIF(OCC_FOUND)
-
# -------------------------------- Salome SMESH --------------------------
# Salome SMESH sources are under src/3rdParty now
freecad-0.12-zipios.patch:
CMakeLists.txt | 1 +
src/Base/CMakeLists.txt | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
--- NEW FILE freecad-0.12-zipios.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-04-08 07:23:26.474216557 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-04-08 19:14:13.606167248 -0500
@@ -85,6 +85,7 @@
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
+OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
# ==============================================================================
diff -Naur FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-04-08 07:23:26.514215262 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-04-08 19:12:39.956997353 -0500
@@ -269,7 +269,6 @@
)
SET(FreeCADBase_SRCS
- ${zipios_SRCS}
${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
@@ -281,6 +280,27 @@
PreCompiled.h
)
+# Use external zipios++ if specified.
+if(USE_EXTERNAL_ZIPIOS)
+ find_library(ZIPIOS_LIBRARY zipios)
+ find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
+ if(ZIPIOS_LIBRARY)
+ message(STATUS "Found zipios++: ${ZIPIOS}")
+ endif()
+ if(ZIPIOS_INCLUDES)
+ message(STATUS "Found zipios++ headers.")
+ endif()
+ if(ZIPIOS_LIBRARY AND ZIPIOS_INCLUDES)
+ list(APPEND FreeCADBase_LIBS ${ZIPIOS_LIBRARY})
+ include_directories(${ZIPIOS_INCLUDES})
+ else()
+ message(FATAL_ERROR "Using external zipios++ was specified but was not found.")
+ endif()
+else(USE_EXTERNAL_ZIPIOS)
+ list(APPEND FreeCADBase_SRCS ${zipios_SRCS})
+endif(USE_EXTERNAL_ZIPIOS)
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-3rdParty.patch:
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE freecad-3rdParty.patch ---
diff -Naur freecad-0.12-svn5325.orig/src/CMakeLists.txt freecad-0.12-svn5325/src/CMakeLists.txt
--- freecad-0.12-svn5325.orig/src/CMakeLists.txt 2011-03-03 09:57:25.000000000 -0600
+++ freecad-0.12-svn5325/src/CMakeLists.txt 2011-12-21 10:58:18.396896819 -0600
@@ -1,6 +1,5 @@
add_subdirectory(Build)
-add_subdirectory(3rdParty)
add_subdirectory(Base)
add_subdirectory(App)
add_subdirectory(Main)
freecad-StartPage.patch:
CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
--- NEW FILE freecad-StartPage.patch ---
diff -Naur freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt 2011-11-30 19:07:40.962208203 -0600
@@ -0,0 +1,31 @@
+SET(StartPage_SRCS
+ StartPage.py
+ __init__.py
+)
+
+SET(StartPage_DATA
+ ArchDesign.py
+ DefaultWorkbench.py
+ LoadDrawingExample.py
+ LoadPartDesignExample.py
+ LoadRobotExample.py
+ LoadSchenkel.py
+ LoadMRU0.py
+ LoadMRU1.py
+ LoadMRU2.py
+ Mesh.py
+ PartDesign.py
+ Background.jpg
+ FreeCAD.png
+ PartDesign.png
+ ArchDesign.png
+ Mesh.png
+ Complete.png
+ PartDesignExample.png
+ ArchExample.png
+ web.png
+)
+
+INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA}
+ DESTINATION Mod/Start/StartPage
+)
freecad-cmake_Mod_fix.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE freecad-cmake_Mod_fix.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 06:26:12.000000000 -0600
+++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-04 11:39:26.918349340 -0600
@@ -18,7 +18,7 @@
MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built")
MESSAGE("Due to the missing Eigen3 library the Robot module won't be built")
ENDIF(EIGEN3_FOUND)
-add_subdirectory(Machining_Distortion)
+#add_subdirectory(Machining_Distortion)
add_subdirectory(ReverseEngineering)
add_subdirectory(MeshPart)
@@ -32,7 +32,7 @@
add_subdirectory(Arch)
-add_subdirectory(Assembly)
+#add_subdirectory(Assembly)
if(FREECAD_BUILD_CAM)
add_subdirectory(Cam)
freecad-gcc-4.7.patch:
Fem/App/HypothesisPy.cpp | 18 +++++++++---------
Mesh/App/WildMagic4/Wm4Query2.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TRational.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TRational.inl | 4 ++--
11 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE freecad-gcc-4.7.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp
--- FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 19:42:01.240612805 -0700
+++ FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 20:20:50.307192529 -0700
@@ -85,15 +85,15 @@
SMESH_HypothesisPy<T>::behaviors().supportSetattr();
SMESH_HypothesisPy<T>::behaviors().type_object()->tp_new = &PyMake;
- add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
- add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
- add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
- add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
- add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
- add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
- add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
- add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
- add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
+ SMESH_HypothesisPy::add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
+ SMESH_HypothesisPy::add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
+ SMESH_HypothesisPy::add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
+ SMESH_HypothesisPy::add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
+ SMESH_HypothesisPy::add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
+ SMESH_HypothesisPy::add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
Base::Interpreter().addType(SMESH_HypothesisPy<T>::behaviors().type_object(),
module,SMESH_HypothesisPy<T>::behaviors().getName());
}
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 20:20:50.307192529 -0700
@@ -55,7 +55,7 @@
Real fLen1 = Math<Real>::Sqrt(fX1*fX1 + fY1*fY1);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1;
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
if (Math<Real>::FAbs(fDet2) >= fScaledUncertainty)
{
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
@@ -93,7 +93,7 @@
Real fLen2 = Math<Real>::Sqrt(fD2x*fD2x + fD2y*fD2y + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 20:20:50.307192529 -0700
@@ -65,7 +65,7 @@
Real fX1 = rkV1[0] - rkV0[0];
Real fY1 = rkV1[1] - rkV0[1];
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -129,7 +129,7 @@
Real fZ0 = fS0x*fD0x + fS0y*fD0y;
Real fZ1 = fS1x*fD1x + fS1y*fD1y;
Real fZ2 = fS2x*fD2x + fS2y*fD2y;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 19:42:01.194614269 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 20:20:50.307192529 -0700
@@ -42,7 +42,7 @@
Integer64 iX1 = (Integer64)rkV1[0] - (Integer64)rkV0[0];
Integer64 iY1 = (Integer64)rkV1[1] - (Integer64)rkV0[1];
- Integer64 iDet2 = Det2(iX0,iY0,iX1,iY1);
+ Integer64 iDet2 = this->Det2(iX0,iY0,iX1,iY1);
return (iDet2 > 0 ? +1 : (iDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -74,7 +74,7 @@
Integer64 iZ0 = iS0x*iD0x + iS0y*iD0y;
Integer64 iZ1 = iS1x*iD1x + iS1y*iD1y;
Integer64 iZ2 = iS2x*iD2x + iS2y*iD2y;
- Integer64 iDet3 = Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
+ Integer64 iDet3 = this->Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
return (iDet3 < 0 ? 1 : (iDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 20:20:50.307192529 -0700
@@ -43,7 +43,7 @@
TInteger<2> kX1((int)rkV1[0] - (int)rkV0[0]);
TInteger<2> kY1((int)rkV1[1] - (int)rkV0[1]);
- TInteger<2> kDet2 = Det2(kX0,kY0,kX1,kY1);
+ TInteger<2> kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -75,7 +75,7 @@
TInteger<4> kZ0 = kS0x*kD0x + kS0y*kD0y;
TInteger<4> kZ1 = kS1x*kD1x + kS1y*kD1y;
TInteger<4> kZ2 = kS2x*kD2x + kS2y*kD2y;
- TInteger<4> kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ TInteger<4> kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 20:20:50.307192529 -0700
@@ -127,7 +127,7 @@
Rational kX1 = m_akRVertex[iV1][0] - m_akRVertex[iV0][0];
Rational kY1 = m_akRVertex[iV1][1] - m_akRVertex[iV0][1];
- Rational kDet2 = Det2(kX0,kY0,kX1,kY1);
+ Rational kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -179,7 +179,7 @@
Rational kZ0 = kS0x*kD0x + kS0y*kD0y;
Rational kZ1 = kS1x*kD1x + kS1y*kD1y;
Rational kZ2 = kS2x*kD2x + kS2y*kD2y;
- Rational kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ Rational kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 20:21:28.563013748 -0700
@@ -62,7 +62,7 @@
Real fLen2 = Math<Real>::Sqrt(fX2*fX2 + fY2*fY2 + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
@@ -115,7 +115,7 @@
Real fLen3 = Math<Real>::Sqrt(fD3x*fD3x+fD3y*fD3y+fD3z*fD3z+fW3*fW3);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2*fLen3;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
if (Math<Real>::FAbs(fDet4) >= fScaledUncertainty)
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 20:21:32.913879668 -0700
@@ -72,7 +72,7 @@
Real fY2 = rkV2[1] - rkV0[1];
Real fZ2 = rkV2[2] - rkV0[2];
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -158,7 +158,7 @@
Real fW1 = fS1x*fD1x + fS1y*fD1y + fS1z*fD1z;
Real fW2 = fS2x*fD2x + fS2y*fD2y + fS2z*fD2z;
Real fW3 = fS3x*fD3x + fS3y*fD3y + fS3z*fD3z;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
return (fDet4 > (Real)0.0 ? 1 : (fDet4 < (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 20:21:36.845758502 -0700
@@ -48,7 +48,7 @@
Integer64 iY2 = (Integer64)rkV2[1] - (Integer64)rkV0[1];
Integer64 iZ2 = (Integer64)rkV2[2] - (Integer64)rkV0[2];
- Integer64 iDet3 = Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
+ Integer64 iDet3 = this->Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
return (iDet3 > 0 ? +1 : (iDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -100,7 +100,7 @@
Integer64 iW1 = iS1x*iD1x + iS1y*iD1y + iS1z*iD1z;
Integer64 iW2 = iS2x*iD2x + iS2y*iD2y + iS2z*iD2z;
Integer64 iW3 = iS3x*iD3x + iS3y*iD3y + iS3z*iD3z;
- Integer64 iDet4 = Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
+ Integer64 iDet4 = this->Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
iD2y,iD2z,iW2,iD3x,iD3y,iD3z,iW3);
return (iDet4 > 0 ? 1 : (iDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 19:42:01.192614333 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 20:21:48.905386855 -0700
@@ -49,7 +49,7 @@
TInteger<4> kY2((int)rkV2[1] - (int)rkV0[1]);
TInteger<4> kZ2((int)rkV2[2] - (int)rkV0[2]);
- TInteger<4> kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ TInteger<4> kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -96,7 +96,7 @@
TInteger<6> kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
TInteger<6> kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
TInteger<6> kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- TInteger<6> kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
+ TInteger<6> kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 20:21:41.135626300 -0700
@@ -136,7 +136,7 @@
Rational kY2 = m_akRVertex[iV2][1] - m_akRVertex[iV0][1];
Rational kZ2 = m_akRVertex[iV2][2] - m_akRVertex[iV0][2];
- Rational kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ Rational kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -208,7 +208,7 @@
Rational kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
Rational kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
Rational kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- Rational kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
+ Rational kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
kD2y,kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
freecad-glu.patch:
GLImageBox.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE freecad-glu.patch ---
diff -Naur freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp
--- freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp 2010-02-18 05:03:53.000000000 -0600
+++ freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-01 16:49:09.041859287 -0600
@@ -27,6 +27,7 @@
# include <GL/glext.h>
#endif
+#include <GL/glu.h>
#include "GLImageBox.h"
using namespace ImageGui;
freecad-system_inst.patch:
freecad-svn5184.mod/CMakeLists.txt | 15 +--
freecad-svn5184.mod/data/examples/CMakeLists.txt | 2
freecad-svn5184.mod/src/App/CMakeLists.txt | 8 +
freecad-svn5184.mod/src/Base/CMakeLists.txt | 3
freecad-svn5184.mod/src/Doc/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt | 8 -
freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt | 6 -
freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt | 10 --
freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt | 4
freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt | 5 -
freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt | 47 +++++-----
freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt | 12 +-
freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt | 21 ++--
freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt | 3
freecad-svn5220/src/App/CMakeLists.txt | 3
freecad-svn5220/src/Base/CMakeLists.txt | 4
freecad-svn5220/src/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Main/CMakeLists.txt | 7 +
freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 3
67 files changed, 171 insertions(+), 119 deletions(-)
--- NEW FILE freecad-system_inst.patch ---
diff -Naur freecad-svn5184.orig/CMakeLists.txt freecad-svn5184.mod/CMakeLists.txt
--- freecad-svn5184.orig/CMakeLists.txt 2011-11-30 09:36:58.969275770 -0600
+++ freecad-svn5184.mod/CMakeLists.txt 2011-11-30 16:07:00.353807219 -0600
@@ -61,11 +61,12 @@
if(WIN32)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
else(WIN32)
-# SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
+ SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad")
+ SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif(WIN32)
-# ================================================================================
-# == Win32 is default behaviour use the LibPack copied in Source tree ============
+# ==============================================================================
+# == Win32 is default behaviour use the LibPack copied in Source tree ==========
if(MSVC)
OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON)
set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack")
@@ -74,7 +75,7 @@
set(FREECAD_LIBPACK_DIR "" CACHE PATH "Directory of the FreeCAD LibPack")
endif(MSVC)
-# ================================================================================
+# ==============================================================================
# == All the options for the build process ============
OPTION(FREECAD_BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
@@ -82,10 +83,10 @@
OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
+SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
+SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
-
-
-# ================================================================================
+# ==============================================================================
if(FREECAD_LIBPACK_USE)
# checking for a unique file in LibPack location to make sure the right version of the LibPack is there
diff -Naur freecad-svn5184.orig/data/examples/CMakeLists.txt freecad-svn5184.mod/data/examples/CMakeLists.txt
--- freecad-svn5184.orig/data/examples/CMakeLists.txt 2011-05-24 14:02:32.000000000 -0500
+++ freecad-svn5184.mod/data/examples/CMakeLists.txt 2011-11-30 11:56:01.050240955 -0600
@@ -12,7 +12,7 @@
fc_copy_sources("data/examples" "Examples" ${Examples_Files})
-install(
+INSTALL(
FILES
${Examples_Files}
DESTINATION
diff -Naur freecad-svn5184.orig/src/App/CMakeLists.txt freecad-svn5184.mod/src/App/CMakeLists.txt
--- freecad-svn5184.orig/src/App/CMakeLists.txt 2011-06-14 09:11:52.000000000 -0500
+++ freecad-svn5184.mod/src/App/CMakeLists.txt 2011-11-30 16:08:36.464683016 -0600
@@ -3,6 +3,14 @@
add_definitions(-DBOOST_DYN_LINK)
endif(WIN32)
+IF(RESOURCEDIR)
+ add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
+ENDIF(RESOURCEDIR)
+
+IF(DOCDIR)
+ add_definitions(-DDOCDIR="${DOCDIR}")
+ENDIF(DOCDIR)
+
include_directories(
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
diff -Naur freecad-svn5184.orig/src/Base/CMakeLists.txt freecad-svn5184.mod/src/Base/CMakeLists.txt
--- freecad-svn5184.orig/src/Base/CMakeLists.txt 2011-01-26 05:56:38.000000000 -0600
+++ freecad-svn5184.mod/src/Base/CMakeLists.txt 2011-11-30 10:45:20.128198748 -0600
@@ -309,6 +309,9 @@
LIBRARY DESTINATION lib
)
else(WIN32)
+ set_target_properties(FreeCADBase
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5184.orig/src/Doc/CMakeLists.txt freecad-svn5184.mod/src/Doc/CMakeLists.txt
--- freecad-svn5184.orig/src/Doc/CMakeLists.txt 2011-01-28 08:38:53.000000000 -0600
+++ freecad-svn5184.mod/src/Doc/CMakeLists.txt 2011-11-30 10:38:04.225248987 -0600
@@ -1,5 +1,5 @@
find_package(Doxygen)
-if( DOXYGEN_FOUND)
+if(DOXYGEN_FOUND)
IF (DOXYGEN_DOT_EXECUTABLE)
SET(HAVE_DOT YES)
diff -Naur freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt 2011-10-14 11:48:44.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt 2011-11-30 11:57:29.541317665 -0600
@@ -30,9 +30,7 @@
fc_copy_sources("Mod/Arch" "Arch" ${all_files})
-install(
- FILES
- ${Arch_SRCS}
- DESTINATION
- Mod/Arch
+INSTALL(
+ FILES ${Arch_SRCS}
+ DESTINATION Mod/Arch
)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt 2011-11-30 11:00:47.662045120 -0600
@@ -38,6 +38,7 @@
else(MSVC)
set_target_properties(Complete PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(Complete PROPERTIES PREFIX "")
+ set_target_properties(Complete PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Complete DESTINATION lib)
+INSTALL(TARGETS Complete DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt 2011-11-30 10:57:26.092627644 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt 2011-02-02 09:56:18.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt 2011-11-30 11:03:20.932041683 -0600
@@ -34,14 +34,14 @@
fc_copy_sources("Mod/Draft" "Draft" ${all_files})
-install(
+
+INSTALL(
FILES
${DraftLibs_SRCS}
DESTINATION
Mod/Draft/draftlibs
)
-
-install(
+INSTALL(
FILES
${Draft_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt 2011-11-30 12:03:31.686356774 -0600
@@ -85,6 +85,7 @@
else(MSVC)
set_target_properties(Drawing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(Drawing PROPERTIES PREFIX "")
+ set_target_properties(Drawing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Drawing DESTINATION lib)
+INSTALL(TARGETS Drawing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt 2011-11-30 11:03:56.361884884 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt 2011-06-15 09:24:33.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt 2011-11-30 11:05:11.758423159 -0600
@@ -83,6 +83,7 @@
else(MSVC)
set_target_properties(DrawingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(DrawingGui PROPERTIES PREFIX "")
+ set_target_properties(DrawingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS DrawingGui DESTINATION lib)
+INSTALL(TARGETS DrawingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt 2011-03-31 10:38:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt 2011-11-30 11:24:22.670819700 -0600
@@ -79,6 +79,7 @@
else(MSVC)
set_target_properties(Fem PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(Fem PROPERTIES PREFIX "")
+ set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Fem DESTINATION lib)
+INSTALL(TARGETS Fem DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt 2010-11-23 07:25:34.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt 2011-11-30 11:23:00.206515462 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt 2011-11-30 11:23:44.905054292 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(FemGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(FemGui PROPERTIES PREFIX "")
+ set_target_properties(FemGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS FemGui DESTINATION lib)
+INSTALL(TARGETS FemGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt 2011-11-30 11:25:49.758972604 -0600
@@ -48,23 +48,21 @@
fc_copy_sources("Mod/Idf" "Idf" ${all_files})
-install(
+INSTALL(
FILES
${IdfLibs_SRCS}
DESTINATION
Mod/Idf/Idflibs
)
-
-install(
+INSTALL(
FILES
${IdfLang_SRCS}
DESTINATION
Mod/Idf/Languages
)
-
-install(
+INSTALL(
FILES
${Idf_SRCS}
DESTINATION
Mod/Idf
- )
+)
diff -Naur freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt 2011-01-25 09:40:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt 2011-11-30 11:27:17.458105233 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(Image PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(Image PROPERTIES PREFIX "")
+ set_target_properties(Image PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Image DESTINATION lib)
+INSTALL(TARGETS Image DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt 2011-11-30 11:26:36.060458740 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt 2011-01-24 12:06:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt 2011-11-30 11:27:58.559761333 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(ImageGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(ImageGui PROPERTIES PREFIX "")
+ set_target_properties(ImageGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImageGui DESTINATION lib)
+INSTALL(TARGETS ImageGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt 2011-01-04 06:35:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt 2011-11-30 11:28:45.368230781 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
DESTINATION
Mod/Import
-)
+)
diff -Naur freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt 2011-11-30 11:29:14.799268344 -0600
@@ -56,6 +56,7 @@
else(MSVC)
set_target_properties(ImportGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
set_target_properties(ImportGui PROPERTIES PREFIX "")
+ set_target_properties(ImportGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImportGui DESTINATION lib)
+INSTALL(TARGETS ImportGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt 2011-11-30 11:30:36.267604260 -0600
@@ -50,6 +50,7 @@
else(MSVC)
set_target_properties(Inspection PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
set_target_properties(Inspection PROPERTIES PREFIX "")
+ set_target_properties(Inspection PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-
-install(TARGETS Inspection DESTINATION lib)
+
+INSTALL(TARGETS Inspection DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt 2011-01-26 03:20:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt 2011-11-30 11:29:53.774993917 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt 2011-11-30 11:31:46.555305748 -0600
@@ -47,26 +47,27 @@
ViewProviderInspection.cpp
ViewProviderInspection.h
Workbench.cpp
- Workbench.h
-)
-
-add_library(InspectionGui SHARED ${InspectionGui_SRCS})
-target_link_libraries(InspectionGui ${InspectionGui_LIBS})
-fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
-
-if(MSVC)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "../")
-elseif(MINGW)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-else(MSVC)
- set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-endif(MSVC)
-
-install(TARGETS InspectionGui DESTINATION lib)
+ Workbench.h
+)
+
+add_library(InspectionGui SHARED ${InspectionGui_SRCS})
+target_link_libraries(InspectionGui ${InspectionGui_LIBS})
+fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
+
+if(MSVC)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "../")
+elseif(MINGW)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+else(MSVC)
+ set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+ set_target_properties(InspectionGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+endif(MSVC)
+
+INSTALL(TARGETS InspectionGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt 2011-05-20 09:39:48.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt 2011-11-30 11:33:47.854316080 -0600
@@ -347,6 +347,7 @@
else(MSVC)
set_target_properties(Mesh PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(Mesh PROPERTIES PREFIX "")
+ set_target_properties(Mesh PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Mesh DESTINATION lib)
+INSTALL(TARGETS Mesh DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt 2011-11-30 11:33:19.819243657 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt 2010-11-05 09:59:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt 2011-11-30 11:34:26.387041214 -0600
@@ -124,6 +124,7 @@
else(MSVC)
set_target_properties(MeshGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(MeshGui PROPERTIES PREFIX "")
+ set_target_properties(MeshGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshGui DESTINATION lib)
+INSTALL(TARGETS MeshGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt 2011-11-30 11:35:26.526051628 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(MeshPart PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPart PROPERTIES PREFIX "")
+ set_target_properties(MeshPart PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPart DESTINATION lib)
+INSTALL(TARGETS MeshPart DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt 2011-11-30 11:34:57.482012457 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt 2010-10-02 18:53:11.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt 2011-11-30 11:35:53.700152675 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(MeshPartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPartGui PROPERTIES PREFIX "")
+ set_target_properties(MeshPartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPartGui DESTINATION lib)
+INSTALL(TARGETS MeshPartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt 2011-11-30 11:36:57.685036101 -0600
@@ -252,6 +252,7 @@
else(MSVC)
set_target_properties(Part PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(Part PROPERTIES PREFIX "")
+ set_target_properties(Part PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Part DESTINATION lib)
+INSTALL(TARGETS Part DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt 2011-11-30 11:36:19.927285066 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt 2011-10-15 08:31:58.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt 2011-11-30 11:37:36.752743837 -0600
@@ -178,6 +178,7 @@
else(MSVC)
set_target_properties(PartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(PartGui PROPERTIES PREFIX "")
+ set_target_properties(PartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartGui DESTINATION lib)
+INSTALL(TARGETS PartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-22 04:37:02.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-30 11:38:57.340078457 -0600
@@ -105,6 +105,7 @@
else(MSVC)
set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesign PROPERTIES PREFIX "")
+ set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesign DESTINATION lib)
+INSTALL(TARGETS PartDesign DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt 2011-11-30 11:38:26.413101317 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-17 03:29:05.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-30 11:39:37.893737252 -0600
@@ -134,6 +134,7 @@
else(MSVC)
set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesignGui PROPERTIES PREFIX "")
+ set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesignGui DESTINATION lib)
+INSTALL(TARGETS PartDesignGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt 2011-11-30 11:41:17.777434173 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(Points PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(Points PROPERTIES PREFIX "")
+ set_target_properties(Points PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Points DESTINATION lib)
+INSTALL(TARGETS Points DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt 2011-11-30 11:40:18.488394768 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt 2011-11-30 11:42:01.941973792 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(PointsGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(PointsGui PROPERTIES PREFIX "")
+ set_target_properties(PointsGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PointsGui DESTINATION lib)
+INSTALL(TARGETS PointsGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt 2011-11-30 11:42:57.676130964 -0600
@@ -74,6 +74,7 @@
else(MSVC)
set_target_properties(Raytracing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(Raytracing PROPERTIES PREFIX "")
+ set_target_properties(Raytracing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Raytracing DESTINATION lib)
+INSTALL(TARGETS Raytracing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt 2011-11-30 11:42:29.349067575 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt 2011-11-30 11:43:26.181188497 -0600
@@ -89,6 +89,7 @@
else(MSVC)
set_target_properties(RaytracingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(RaytracingGui PROPERTIES PREFIX "")
+ set_target_properties(RaytracingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RaytracingGui DESTINATION lib)
+INSTALL(TARGETS RaytracingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt 2011-11-30 11:44:24.234269226 -0600
@@ -47,6 +47,7 @@
else(MSVC)
set_target_properties(ReverseEngineering PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineering PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineering PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ReverseEngineering DESTINATION lib)
+INSTALL(TARGETS ReverseEngineering DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt 2011-11-30 11:43:50.583381744 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt 2011-11-30 11:45:31.977029697 -0600
@@ -137,6 +137,7 @@
else(MSVC)
set_target_properties(Robot PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(Robot PROPERTIES PREFIX "")
+ set_target_properties(Robot PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Robot DESTINATION lib)
+INSTALL(TARGETS Robot DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt 2011-11-30 11:45:04.496938137 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt 2011-11-30 11:46:01.680047793 -0600
@@ -162,6 +162,7 @@
else(MSVC)
set_target_properties(RobotGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(RobotGui PROPERTIES PREFIX "")
+ set_target_properties(RobotGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RobotGui DESTINATION lib)
+INSTALL(TARGETS RobotGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt 2011-11-30 11:47:17.199551470 -0600
@@ -46,6 +46,7 @@
else(MSVC)
set_target_properties(Sandbox PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(Sandbox PROPERTIES PREFIX "")
+ set_target_properties(Sandbox PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sandbox DESTINATION lib)
+INSTALL(TARGETS Sandbox DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt 2010-08-24 06:42:52.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt 2011-11-30 11:46:39.023813388 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
- FILES
- Init.py
- InitGui.py
- DESTINATION
- Mod/Sandbox
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ DESTINATION
+ Mod/Sandbox
)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-07-08 08:07:49.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-11-30 11:47:59.296160060 -0600
@@ -57,6 +57,7 @@
else(MSVC)
set_target_properties(SandboxGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(SandboxGui PROPERTIES PREFIX "")
+ set_target_properties(SandboxGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SandboxGui DESTINATION lib)
+INSTALL(TARGETS SandboxGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt 2011-09-07 09:40:01.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt 2011-11-30 11:48:49.511500367 -0600
@@ -121,6 +121,7 @@
else(MSVC)
set_target_properties(Sketcher PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(Sketcher PROPERTIES PREFIX "")
+ set_target_properties(Sketcher PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sketcher DESTINATION lib)
+INSTALL(TARGETS Sketcher DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt 2011-11-30 11:48:21.240434767 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-10-03 17:57:56.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-11-30 11:49:16.609604780 -0600
@@ -113,6 +113,7 @@
else(MSVC)
set_target_properties(SketcherGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(SketcherGui PROPERTIES PREFIX "")
+ set_target_properties(SketcherGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SketcherGui DESTINATION lib)
+INSTALL(TARGETS SketcherGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt 2011-05-16 11:06:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt 2011-11-30 11:50:12.614753899 -0600
@@ -37,6 +37,7 @@
else(MSVC)
set_target_properties(Start PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(Start PROPERTIES PREFIX "")
+ set_target_properties(Start PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Start DESTINATION lib)
+INSTALL(TARGETS Start DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt 2011-11-30 19:08:17.276035136 -0600
@@ -2,9 +2,10 @@
add_subdirectory(App)
if(FREECAD_BUILD_GUI)
add_subdirectory(Gui)
+ add_subdirectory(StartPage)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt 2011-09-13 09:34:13.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt 2011-11-30 11:50:41.919785412 -0600
@@ -70,6 +70,7 @@
else(MSVC)
set_target_properties(StartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(StartGui PROPERTIES PREFIX "")
+ set_target_properties(StartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS StartGui DESTINATION lib)
+INSTALL(TARGETS StartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt 2011-08-08 14:17:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt 2011-11-30 11:51:17.723602252 -0600
@@ -9,13 +9,14 @@
DocumentObject.py
)
-install(
- FILES
- Init.py
- InitGui.py
- Commands.py
- FeaturePython.py
- PythonQt.py
- Tests.py
- DESTINATION
- Mod/TemplatePyMod)
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ Commands.py
+ FeaturePython.py
+ PythonQt.py
+ Tests.py
+ DESTINATION
+ Mod/TemplatePyMod
+)
diff -Naur freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt 2011-07-13 05:10:30.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt 2011-11-30 11:51:58.554253017 -0600
@@ -20,7 +20,7 @@
fc_copy_sources("Mod/Test" "Test" ${Test_SRCS})
-install(
+INSTALL(
FILES
${Test_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt 2011-11-30 11:52:37.617962226 -0600
@@ -65,6 +65,7 @@
else(MSVC)
set_target_properties(QtUnitGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
set_target_properties(QtUnitGui PROPERTIES PREFIX "")
+ set_target_properties(QtUnitGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS QtUnitGui DESTINATION lib)
+INSTALL(TARGETS QtUnitGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt 2011-11-30 11:53:02.772131074 -0600
@@ -3,7 +3,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt 2011-11-30 11:54:00.295230454 -0600
@@ -52,6 +52,7 @@
else(MSVC)
set_target_properties(WebGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
set_target_properties(WebGui PROPERTIES PREFIX "")
+ set_target_properties(WebGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS WebGui DESTINATION lib)
+INSTALL(TARGETS WebGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt 2011-12-05 10:20:10.830553148 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(CompleteGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(CompleteGui PROPERTIES PREFIX "")
+ set_target_properties(CompleteGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
install(TARGETS CompleteGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2011-12-05 10:50:21.815925156 -0600
@@ -54,6 +54,9 @@
else(MSVC)
set_target_properties(ReverseEngineeringGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineeringGui
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
endif(MSVC)
install(TARGETS ReverseEngineeringGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/App/CMakeLists.txt freecad-svn5220/src/App/CMakeLists.txt
--- freecad-svn5220.orig/src/App/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/App/CMakeLists.txt 2011-12-05 13:35:16.637348028 -0600
@@ -184,6 +184,7 @@
set_target_properties(FreeCADApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADApp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADApp PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -192,7 +193,7 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- INSTALL(TARGETS FreeCADApp
+ INSTALL(TARGETS FreeCADApp
LIBRARY DESTINATION lib
)
endif(WIN32)
diff -Naur freecad-svn5220.orig/src/Base/CMakeLists.txt freecad-svn5220/src/Base/CMakeLists.txt
--- freecad-svn5220.orig/src/Base/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/Base/CMakeLists.txt 2011-12-05 13:37:27.551041426 -0600
@@ -301,6 +301,7 @@
set_target_properties(FreeCADBase PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADBase PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADBase PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -309,9 +310,6 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- set_target_properties(FreeCADBase
- PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
- )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5220.orig/src/Gui/CMakeLists.txt freecad-svn5220/src/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Gui/CMakeLists.txt 2011-07-25 09:59:26.000000000 -0500
+++ freecad-svn5220/src/Gui/CMakeLists.txt 2011-12-05 13:35:57.316009531 -0600
@@ -830,6 +830,7 @@
set_target_properties(FreeCADGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
diff -Naur freecad-svn5220.orig/src/Main/CMakeLists.txt freecad-svn5220/src/Main/CMakeLists.txt
--- freecad-svn5220.orig/src/Main/CMakeLists.txt 2011-08-07 06:09:01.000000000 -0500
+++ freecad-svn5220/src/Main/CMakeLists.txt 2011-12-05 13:42:07.577838112 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(FreeCADMain PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMain PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMain PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -99,6 +100,7 @@
else(MSVC)
set_target_properties(FreeCADMainCmd PROPERTIES OUTPUT_NAME "FreeCADCmd")
set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMainCmd PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -140,6 +142,7 @@
set_target_properties(FreeCADMainPy PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMainPy PROPERTIES PREFIX "")
set_target_properties(FreeCADMainPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADMainPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -178,10 +181,12 @@
set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
else(MSVC)
set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -194,4 +199,4 @@
LIBRARY DESTINATION lib
)
endif(WIN32)
-endif(FREECAD_BUILD_GUI)
\ No newline at end of file
+endif(FREECAD_BUILD_GUI)
--- NEW FILE freecad.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH FREECAD 1 "July 25, 2007" freecad "Linux User's Manual"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
freecad \- An extensible Open Source CAx program for Unix/X11
.SH SYNOPSIS
.B freecad
.RI [ options ] " files"
.br
.B freecadcmd
.RI [ options ] " files"
.SH DESCRIPTION
.B FreeCAD
is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features
some key concepts like macro recording, workbenches, ability to run as a
server and dynamically loadable application extensions and it is designed
to be platform independent.
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH USAGE
\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of the options supported by \fBfreecad\fR is included below.
.SS "Generic options"
.TP
\fB\-h, \-\-help\fR
Show summary of options.
.TP
\fB\-v, \-\-version\fR
Show version of program.
.TP
\fB\-c, \-\-console\fR
Start in console mode.
.TP
\fB\-\-response\-file\fR \fIarg\fR
Can be specified with '@name', too.
.SS "Configuration"
.TP
\fB\-l, \-\-write\-log\fR
Write a log file.
.TP
\fB\-t, \-\-run\-test\fR \fIarg\fR
Test level.
.TP
\fB\-M, \-\-module\-path\fR \fIarg\fR
Additional module path.
.TP
\fB\-P, \-\-python\-path\fR \fIarg\fR
Additional Python path.
.SH SEE ALSO
To get more information about \fBFreeCAD\fR, please visit \fIhttp://juergen\-riegel.net/FreeCAD/Docu/index.php/Main_Page\fR
.SH BUGS
To report a bug, please visit \fIhttp://free-cad.sf.net/\fR
.SH AUTHOR
This manual page was written by Werner Mayer.
--- NEW FILE freecad.desktop ---
[Desktop Entry]
Version=1.0
Name=FreeCAD
Name[de]=FreeCAD
Comment=Feature based Parametric Modeler
Comment[de]=Feature-basierter parametrischer Modellierer
GenericName=CAD Application
GenericName[de]=CAD-Anwendung
Exec=/usr/bin/FreeCAD %F
Path=/usr/@lib@/freecad
Terminal=false
Type=Application
Icon=freecad
Categories=Graphics;Science;Education;Engineering;
StartupNotify=true
GenericName[de_DE]=Feature-basierter parametrischer Modellierer
MimeType=application/x-extension-fcstd;
--- NEW FILE freecad.spec ---
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web
# This revision is 0.12 final.
%global svnrev 5284
# Use update cmake package on EL builds.
%if 0%{?el6}
%global cmake %cmake28
%endif
# Some configuration options for other environments
# rpmbuild --with=occ: Compile using OpenCASCADE instead of OCE
%global occ %{?_with_occ: 1} %{?!_with_occ: 0}
# rpmbuild --with=bundled_zipios: use bundled version of zipios++
%global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 0}
# rpmbuild --with=bundled_pycxx: use bundled version of pycxx
%global bundled_pycxx %{?_with_bundled_pycxx: 1} %{?!_with_bundled_pycxx: 0}
# rpmbuild --with=bundled_smesh: use bundled version of Salome's Mesh
%global bundled_smesh %{?_with_bundled_smesh: 1} %{?!_with_bundled_smesh: 0}
Name: freecad
Version: 0.12
Release: 7%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
# This package must go in the non-free repository because of its dependence
# on OCE which is considered non-free.
License: GPLv3+ with exception
URL: http://sourceforge.net/apps/mediawiki/free-cad/
Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{svnrev}.ta...
Source101: freecad.desktop
Source102: freecad.1
# Patches 0 & 2 accepted upstream.
# https://sourceforge.net/apps/mantisbt/free-cad/view.php?id=519
# Fix a bunch of rpath issues and other tweaks.
Patch0: freecad-system_inst.patch
# Remove bundled libs from cmake configuration.
Patch1: freecad-3rdParty.patch
# Fix incomplete cmake config.
Patch2: freecad-StartPage.patch
# Fixed in svn
Patch3: freecad-glu.patch
# Disable unfinished modules.
Patch4: freecad-cmake_Mod_fix.patch
# Unbundle zipios++
Patch5: freecad-0.12-zipios.patch
# Patch for gcc 4.7
Patch6: freecad-gcc-4.7.patch
# Add build option for OpenCASCADE
Patch7: freecad-0.12-OpenCASCADE-option.patch
# Unbundle PyCXX
Patch8: freecad-0.12-pycxx.patch
# f2c is only needed for smesh, and maybe not even there
Patch9: freecad-0.12-rm_f2c.patch
# Utilities
BuildRequires: cmake doxygen swig
BuildRequires: gcc-gfortran
BuildRequires: gettext
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
# Development Libraries
BuildRequires: freeimage-devel
BuildRequires: libXmu-devel
BuildRequires: mesa-libGLU-devel
%if %{occ}
BuildRequires: OpenCASCADE-devel
%else
BuildRequires: OCE-devel
%endif
# Not yet in Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=665733
#BuildRequires: Coin3-devel
BuildRequires: Coin2-devel
BuildRequires: python2-devel
BuildRequires: boost-devel
BuildRequires: eigen3-devel
BuildRequires: qt-devel qt-webkit-devel
BuildRequires: SoQt-devel
# Not used yet.
#BuildRequires: ode-devel
BuildRequires: xerces-c xerces-c-devel
BuildRequires: libspnav-devel
#BuildRequires: opencv-devel
%if ! %{bundled_smesh}
BuildRequires: smesh-devel
%endif
%if ! %{bundled_zipios}
BuildRequires: zipios++-devel
%endif
%if ! %{bundled_pycxx}
BuildRequires: python-pycxx-devel
%endif
# Needed for plugin support and is not a soname dependency.
Requires: python-pivy
Requires: hicolor-icon-theme
# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
# prevent private capabilities being advertised in Provides/Requires
%define plugin_regexp /^\\\(libFreeCAD.*%(for i in %{plugins}; do echo -n "\\\|$i\\\|$iGui"; done)\\\)\\\(\\\|Gui\\\)\\.so/d
%{?filter_setup:
%filter_provides_in %{_libdir}/%{name}/lib
%filter_from_requires %{plugin_regexp}
%filter_from_provides %{plugin_regexp}
%filter_setup
}
%description
FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed
directly at mechanical engineering and product design but also fits a wider
range of uses in engineering, such as architecture or other engineering
specialties. It is a feature-based parametric modeler with a modular software
architecture which makes it easy to provide additional functionality without
modifying the core system.
%package doc
Summary: Extended documentation for FreeCAD
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: qt-assistant
%description doc
End user documentation for FreeCAD
%prep
%setup -q -n FreeCAD-%{version}.%{svnrev}
%patch0 -p1 -b .sysinst
%patch1 -p1 -b .3rdparty
%patch2 -p1 -b .startpage
%patch3 -p1 -b .glufix
%patch4 -p1 -b .modfix
%patch5 -p1 -b .zipios
%patch6 -p1 -b .gcc47
%patch7 -p1 -b .OCC
# Remove bundled pycxx if we're not using it
%if ! %{bundled_pycxx}
%patch8 -p1 -b .pycxx
rm -rf src/CXX
%endif
%patch9 -p1 -b .f2c
# Fix encodings
dos2unix -k src/Mod/Test/unittestgui.py \
ChangeLog.txt \
copying.lib \
data/License.txt
# Removed bundled libraries
rm -rf src/3rdParty
%build
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/freecad \
-DRESOURCEDIR=%{_libdir}/freecad \
-DDOCDIR=%{_docdir}/%{name} \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
-DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
%if %{occ}
-DUSE_OCC=TRUE \
%endif
%if ! %{bundled_smesh}
-DSMESH_INCLUDE_DIR=%{_includedir} \
%endif
%if ! %{bundled_zipios}
-DUSE_EXTERNAL_ZIPIOS=TRUE \
%endif
%if ! %{bundled_pycxx}
-DPYCXX_INCLUDE_DIR=$(pkg-config --variable=includedir PyCXX) \
-DPYCXX_SOURCE_DIR=$(pkg-config --variable=srcdir PyCXX) \
%endif
../
make %{?_smp_mflags}
%install
pushd build
make install DESTDIR=%{buildroot}
popd
# Symlink binaries to /usr/bin
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_bindir}
ln -s ../%{_lib}/freecad/bin/FreeCAD .
ln -s ../%{_lib}/freecad/bin/FreeCADCmd .
popd
# Fix problems with unittestgui.py
chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py
# Install desktop file
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE101}
sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop
# Install desktop icon
install -pD -m 0644 src/Gui/Icons/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# Install man page
install -pD -m 0644 %{SOURCE102} \
%{buildroot}%{_mandir}/man1/%{name}.1
# Symlink manpage to other binary names
pushd %{buildroot}%{_mandir}/man1
ln -sf %{name}.1.gz FreeCAD.1.gz
ln -sf %{name}.1.gz FreeCADCmd.1.gz
popd
# Install QT Assistant documentation
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 build/doc/freecad.* %{buildroot}%{_docdir}/%{name}/
# Bug maintainers to keep %%{plugins} macro up to date.
#
# Make sure there are no plugins that need to be added to plugins macro
new_plugins=`ls %{buildroot}%{_libdir}/freecad/lib | sed -e '%{plugin_regexp}'`
if [ -n "$new_plugins" ]; then
echo -e "\n\n\n**** ERROR:\n" \
"\nPlugins not caught by regexp: " $new_plugins \
"\n\nPlugins in %{_libdir}/freecad/lib do not exist in" \
"\nspecfile %%{plugins} macro. Please add these to" \
"\n%%{plugins} macro at top of specfile and rebuild.\n****\n" 1>&2
exit 1
fi
# Make sure there are no entries in the plugins macro that don't match plugins
for p in %{plugins}; do
if [ -z "`ls %{buildroot}%{_libdir}/freecad/lib/$p*.so`" ]; then
set +x
echo -e "\n\n\n**** ERROR:\n" \
"\nExtra entry in %%{plugins} macro with no matching plugin:" \
"'$p'.\n\nPlease remove from %%{plugins} macro at top of" \
"\nspecfile and rebuild.\n****\n" 1>&2
exit 1
fi
done
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bin/
%{_libdir}/%{name}/data/
%{_libdir}/%{name}/lib/
%{_libdir}/%{name}/Mod/
%{_mandir}/man1/*.1.gz
%files doc
%{_docdir}/%{name}
%changelog
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %%doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-6
- Filter out automatically generated Provides/Requires of private libraries
- freecad.desktop not passing 'desktop-file-validate'; fixed
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-5
- New patch to unbundle PyCXX
- Add conditional build options for OpenCASCADE, bundled Zipios++,
bundled PyCXX, bundled smesh
* Tue Jun 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-4
- Add linker flag to stop excessive linking.
* Thu May 31 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-3
- Add patch for GCC 4.7 on Fedora 17.
* Thu Nov 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-2
- Initial release.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/F-16/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Jul 2012 21:00:42 -0000 1.1
+++ sources 7 Jul 2012 13:49:37 -0000 1.2
@@ -0,0 +1 @@
+fcd91286c578a219491ffebb2111bddf freecad-0.12.5284.tar.gz
12 years, 4 months
- 1
- 0
rpms/freecad/F-17 freecad-0.12-OpenCASCADE-option.patch, NONE, 1.1 freecad-0.12-pycxx.patch, NONE, 1.1 freecad-0.12-rm_f2c.patch, NONE, 1.1 freecad-0.12-zipios.patch, NONE, 1.1 freecad-3rdParty.patch, NONE, 1.1 freecad-StartPage.patch, NONE, 1.1 freecad-cmake_Mod_fix.patch, NONE, 1.1 freecad-gcc-4.7.patch, NONE, 1.1 freecad-glu.patch, NONE, 1.1 freecad-system_inst.patch, NONE, 1.1 freecad.1, NONE, 1.1 freecad.desktop, NONE, 1.1 freecad.spec, NONE, 1.1 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/freecad/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6202
Modified Files:
sources
Added Files:
freecad-0.12-OpenCASCADE-option.patch freecad-0.12-pycxx.patch
freecad-0.12-rm_f2c.patch freecad-0.12-zipios.patch
freecad-3rdParty.patch freecad-StartPage.patch
freecad-cmake_Mod_fix.patch freecad-gcc-4.7.patch
freecad-glu.patch freecad-system_inst.patch freecad.1
freecad.desktop freecad.spec
Log Message:
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
freecad-0.12-OpenCASCADE-option.patch:
CMakeLists.txt | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
--- NEW FILE freecad-0.12-OpenCASCADE-option.patch ---
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-24 01:14:02.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-24 01:18:52.000000000 -0500
@@ -163,15 +163,20 @@
#first, look for OpenCASCADE Community Edition (OCE)
#if OCE is installed in a nonstandard location, add -DOCE_DIR=/path/to/dir/containing/OCEConfig.cmake
# when configuring with cmake, i.e. cmake .. -DOCE_DIR=/usr/share/cmake
- if( NOT DEFINED OCE_DIR )
- if( UNIX )
- set( OCE_DIR "/usr/local/share/cmake/" )
- else()
- set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ if( NOT DEFINED USE_OCC )
+ if( NOT DEFINED OCE_DIR )
+ if( UNIX )
+ set( OCE_DIR "/usr/local/share/cmake/" )
+ else()
+ set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ endif()
endif()
+ find_package ( OCE )
+ else()
+ set(OCE_FOUND FALSE)
+
endif()
- find_package ( OCE )
- if( ${OCE_FOUND} )
+ if( ${OCE_FOUND} AND NOT DEFINED USE_OCC )
message("-- OpenCASCADE Community Edition has been found.")
add_definitions ( -DHAVE_CONFIG_H )
set( OCC_LIBRARIES "TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
freecad-0.12-pycxx.patch:
CMakeLists.txt | 12 +++++
cMake/FindPyCXX.cmake | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
src/Base/CMakeLists.txt | 21 ++-------
3 files changed, 124 insertions(+), 16 deletions(-)
--- NEW FILE freecad-0.12-pycxx.patch ---
This patch adds an option to FreeCAD's cmake to specify an external
PyCXX. PyCXX doesn't really have a standard location, so this will try
to guess a couple of places, but best is to specify on the cmake command
line:
cmake -DPYCXX_INCLUDE_DIR=/usr/include/python2.7 \
-DPYCXX_SOURCE_DIR=/usr/share/python2.7/CXX
diff -ruN FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-25 01:32:19.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-25 01:30:48.000000000 -0500
@@ -86,6 +86,13 @@
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
+SET(PYCXX_INCLUDE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src" CACHE PATH
+ "Path to the directory containing PyCXX's CXX/Config.hxx include file")
+SET(PYCXX_SOURCE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src/CXX" CACHE PATH
+ "Path to the directory containing PyCXX's cxxextensions.c source file")
+
# ==============================================================================
@@ -158,6 +165,11 @@
find_package(ZLIB REQUIRED)
+# -------------------------------- PyCXX --------------------------------
+
+ find_package(PyCXX REQUIRED)
+
+
# -------------------------------- OpenCasCade --------------------------------
#first, look for OpenCASCADE Community Edition (OCE)
diff -ruN FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake FreeCAD-0.12.5284/cMake/FindPyCXX.cmake
--- FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake 1969-12-31 18:00:00.000000000 -0600
+++ FreeCAD-0.12.5284/cMake/FindPyCXX.cmake 2012-06-25 01:30:25.000000000 -0500
@@ -0,0 +1,107 @@
+# Locate PyCXX headers and source files
+
+# This module defines
+# PYCXX_INCLUDE_DIR
+# PYCXX_SOURCE_DIR
+# PYCXX_FOUND
+# PYCXX_SOURCES
+#
+# The PYCXX_*_DIR variables can be set to tell this module where
+# the files are.
+
+
+# There's no standard location for PyCXX.
+#
+# The authors' example is to put it in "~\" [sic].
+#
+# Ubuntu puts the includes into /usr/include/python2.7/CXX and sources into
+# /usr/share/python2.7/CXX.
+#
+# The Zultron Fedora RPM does the same as Ubuntu.
+
+set(PYCXX_FOUND "YES")
+
+# find the header directory
+if(PYCXX_INCLUDE_DIR)
+ # headers better be in there
+ if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+else(PYCXX_INCLUDE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_INCLUDE_DIR CXX/Config.hxx
+ ${PYTHON_INCLUDE_DIR}
+ "${CMAKE_CURRENT_LIST_DIR}/..")
+ if(NOT PYCXX_INCLUDE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
+ "the location of CXX/Config.hxx")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_INCLUDE_DIR)
+endif(PYCXX_INCLUDE_DIR)
+
+# find the sources directory
+if(PYCXX_SOURCE_DIR)
+ # source directory specified, they'd better be there
+ if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+else(PYCXX_SOURCE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_SOURCE_DIR cxxextensions.c
+ "${PYCXX_INCLUDE_DIR}/CXX"
+ "${PYCXX_INCLUDE_DIR}/Src"
+ "${PYTHON_INCLUDE_DIR}/CXX"
+ "${PYTHON_INCLUDE_DIR}/Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../CXX")
+ if(NOT PYCXX_SOURCE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_SOURCE_DIR to "
+ "the location of cxxextensions.c")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_SOURCE_DIR)
+endif(PYCXX_SOURCE_DIR)
+
+# see what we've got
+if(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX found:")
+ MESSAGE(STATUS " Headers: ${PYCXX_INCLUDE_DIR}")
+ MESSAGE(STATUS " Sources: ${PYCXX_SOURCE_DIR}")
+
+ # Build the list of sources for convenience
+ set(PYCXX_SOURCES
+ ${PYCXX_SOURCE_DIR}/cxxextensions.c
+ ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
+ ${PYCXX_SOURCE_DIR}/cxxsupport.cxx
+ ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
+ )
+else(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX not found")
+endif(PYCXX_FOUND)
diff -ruN FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-06-25 01:32:18.000000000 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-06-25 01:31:09.000000000 -0500
@@ -121,21 +121,6 @@
)
SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
-SET(pycxx_SRCS
- ../CXX/Config.hxx
- ../CXX/cxxextensions.c
- ../CXX/cxx_extensions.cxx
- ../CXX/cxxsupport.cxx
- ../CXX/Exception.hxx
- ../CXX/Extensions.hxx
- ../CXX/IndirectPythonInterface.cxx
- ../CXX/IndirectPythonInterface.hxx
- ../CXX/Objects.hxx
- ../CXX/Version.hxx
- ../CXX/WrapPython.h
-)
-SOURCE_GROUP("pycxx" FILES ${pycxx_SRCS})
-
SET(FreeCADBase_XML_SRCS
BaseClassPy.xml
BoundBoxPy.xml
@@ -269,7 +254,6 @@
)
SET(FreeCADBase_SRCS
- ${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
${FreeCADBase_XML_SRCS}
@@ -301,6 +285,11 @@
endif(USE_EXTERNAL_ZIPIOS)
+include_directories(${PYCXX_INCLUDE_DIR})
+list(APPEND FreeCADBase_SRCS ${PYCXX_SOURCES})
+SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES})
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-0.12-rm_f2c.patch:
CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
--- NEW FILE freecad-0.12-rm_f2c.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-07-05 08:47:37.921080779 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-07-05 15:28:53.615339177 -0500
@@ -204,12 +204,6 @@
ENDIF()
endif()
-# -------------------------------- f2c ----------------------------------
-
- IF(OCC_FOUND)
- find_package(F2C REQUIRED)
- ENDIF(OCC_FOUND)
-
# -------------------------------- Salome SMESH --------------------------
# Salome SMESH sources are under src/3rdParty now
freecad-0.12-zipios.patch:
CMakeLists.txt | 1 +
src/Base/CMakeLists.txt | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
--- NEW FILE freecad-0.12-zipios.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-04-08 07:23:26.474216557 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-04-08 19:14:13.606167248 -0500
@@ -85,6 +85,7 @@
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
+OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
# ==============================================================================
diff -Naur FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-04-08 07:23:26.514215262 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-04-08 19:12:39.956997353 -0500
@@ -269,7 +269,6 @@
)
SET(FreeCADBase_SRCS
- ${zipios_SRCS}
${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
@@ -281,6 +280,27 @@
PreCompiled.h
)
+# Use external zipios++ if specified.
+if(USE_EXTERNAL_ZIPIOS)
+ find_library(ZIPIOS_LIBRARY zipios)
+ find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
+ if(ZIPIOS_LIBRARY)
+ message(STATUS "Found zipios++: ${ZIPIOS}")
+ endif()
+ if(ZIPIOS_INCLUDES)
+ message(STATUS "Found zipios++ headers.")
+ endif()
+ if(ZIPIOS_LIBRARY AND ZIPIOS_INCLUDES)
+ list(APPEND FreeCADBase_LIBS ${ZIPIOS_LIBRARY})
+ include_directories(${ZIPIOS_INCLUDES})
+ else()
+ message(FATAL_ERROR "Using external zipios++ was specified but was not found.")
+ endif()
+else(USE_EXTERNAL_ZIPIOS)
+ list(APPEND FreeCADBase_SRCS ${zipios_SRCS})
+endif(USE_EXTERNAL_ZIPIOS)
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-3rdParty.patch:
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE freecad-3rdParty.patch ---
diff -Naur freecad-0.12-svn5325.orig/src/CMakeLists.txt freecad-0.12-svn5325/src/CMakeLists.txt
--- freecad-0.12-svn5325.orig/src/CMakeLists.txt 2011-03-03 09:57:25.000000000 -0600
+++ freecad-0.12-svn5325/src/CMakeLists.txt 2011-12-21 10:58:18.396896819 -0600
@@ -1,6 +1,5 @@
add_subdirectory(Build)
-add_subdirectory(3rdParty)
add_subdirectory(Base)
add_subdirectory(App)
add_subdirectory(Main)
freecad-StartPage.patch:
CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
--- NEW FILE freecad-StartPage.patch ---
diff -Naur freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt 2011-11-30 19:07:40.962208203 -0600
@@ -0,0 +1,31 @@
+SET(StartPage_SRCS
+ StartPage.py
+ __init__.py
+)
+
+SET(StartPage_DATA
+ ArchDesign.py
+ DefaultWorkbench.py
+ LoadDrawingExample.py
+ LoadPartDesignExample.py
+ LoadRobotExample.py
+ LoadSchenkel.py
+ LoadMRU0.py
+ LoadMRU1.py
+ LoadMRU2.py
+ Mesh.py
+ PartDesign.py
+ Background.jpg
+ FreeCAD.png
+ PartDesign.png
+ ArchDesign.png
+ Mesh.png
+ Complete.png
+ PartDesignExample.png
+ ArchExample.png
+ web.png
+)
+
+INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA}
+ DESTINATION Mod/Start/StartPage
+)
freecad-cmake_Mod_fix.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE freecad-cmake_Mod_fix.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 06:26:12.000000000 -0600
+++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-04 11:39:26.918349340 -0600
@@ -18,7 +18,7 @@
MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built")
MESSAGE("Due to the missing Eigen3 library the Robot module won't be built")
ENDIF(EIGEN3_FOUND)
-add_subdirectory(Machining_Distortion)
+#add_subdirectory(Machining_Distortion)
add_subdirectory(ReverseEngineering)
add_subdirectory(MeshPart)
@@ -32,7 +32,7 @@
add_subdirectory(Arch)
-add_subdirectory(Assembly)
+#add_subdirectory(Assembly)
if(FREECAD_BUILD_CAM)
add_subdirectory(Cam)
freecad-gcc-4.7.patch:
Fem/App/HypothesisPy.cpp | 18 +++++++++---------
Mesh/App/WildMagic4/Wm4Query2.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TRational.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TRational.inl | 4 ++--
11 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE freecad-gcc-4.7.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp
--- FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 19:42:01.240612805 -0700
+++ FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 20:20:50.307192529 -0700
@@ -85,15 +85,15 @@
SMESH_HypothesisPy<T>::behaviors().supportSetattr();
SMESH_HypothesisPy<T>::behaviors().type_object()->tp_new = &PyMake;
- add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
- add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
- add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
- add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
- add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
- add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
- add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
- add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
- add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
+ SMESH_HypothesisPy::add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
+ SMESH_HypothesisPy::add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
+ SMESH_HypothesisPy::add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
+ SMESH_HypothesisPy::add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
+ SMESH_HypothesisPy::add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
+ SMESH_HypothesisPy::add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
Base::Interpreter().addType(SMESH_HypothesisPy<T>::behaviors().type_object(),
module,SMESH_HypothesisPy<T>::behaviors().getName());
}
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 20:20:50.307192529 -0700
@@ -55,7 +55,7 @@
Real fLen1 = Math<Real>::Sqrt(fX1*fX1 + fY1*fY1);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1;
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
if (Math<Real>::FAbs(fDet2) >= fScaledUncertainty)
{
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
@@ -93,7 +93,7 @@
Real fLen2 = Math<Real>::Sqrt(fD2x*fD2x + fD2y*fD2y + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 20:20:50.307192529 -0700
@@ -65,7 +65,7 @@
Real fX1 = rkV1[0] - rkV0[0];
Real fY1 = rkV1[1] - rkV0[1];
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -129,7 +129,7 @@
Real fZ0 = fS0x*fD0x + fS0y*fD0y;
Real fZ1 = fS1x*fD1x + fS1y*fD1y;
Real fZ2 = fS2x*fD2x + fS2y*fD2y;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 19:42:01.194614269 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 20:20:50.307192529 -0700
@@ -42,7 +42,7 @@
Integer64 iX1 = (Integer64)rkV1[0] - (Integer64)rkV0[0];
Integer64 iY1 = (Integer64)rkV1[1] - (Integer64)rkV0[1];
- Integer64 iDet2 = Det2(iX0,iY0,iX1,iY1);
+ Integer64 iDet2 = this->Det2(iX0,iY0,iX1,iY1);
return (iDet2 > 0 ? +1 : (iDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -74,7 +74,7 @@
Integer64 iZ0 = iS0x*iD0x + iS0y*iD0y;
Integer64 iZ1 = iS1x*iD1x + iS1y*iD1y;
Integer64 iZ2 = iS2x*iD2x + iS2y*iD2y;
- Integer64 iDet3 = Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
+ Integer64 iDet3 = this->Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
return (iDet3 < 0 ? 1 : (iDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 20:20:50.307192529 -0700
@@ -43,7 +43,7 @@
TInteger<2> kX1((int)rkV1[0] - (int)rkV0[0]);
TInteger<2> kY1((int)rkV1[1] - (int)rkV0[1]);
- TInteger<2> kDet2 = Det2(kX0,kY0,kX1,kY1);
+ TInteger<2> kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -75,7 +75,7 @@
TInteger<4> kZ0 = kS0x*kD0x + kS0y*kD0y;
TInteger<4> kZ1 = kS1x*kD1x + kS1y*kD1y;
TInteger<4> kZ2 = kS2x*kD2x + kS2y*kD2y;
- TInteger<4> kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ TInteger<4> kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 20:20:50.307192529 -0700
@@ -127,7 +127,7 @@
Rational kX1 = m_akRVertex[iV1][0] - m_akRVertex[iV0][0];
Rational kY1 = m_akRVertex[iV1][1] - m_akRVertex[iV0][1];
- Rational kDet2 = Det2(kX0,kY0,kX1,kY1);
+ Rational kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -179,7 +179,7 @@
Rational kZ0 = kS0x*kD0x + kS0y*kD0y;
Rational kZ1 = kS1x*kD1x + kS1y*kD1y;
Rational kZ2 = kS2x*kD2x + kS2y*kD2y;
- Rational kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ Rational kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 20:21:28.563013748 -0700
@@ -62,7 +62,7 @@
Real fLen2 = Math<Real>::Sqrt(fX2*fX2 + fY2*fY2 + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
@@ -115,7 +115,7 @@
Real fLen3 = Math<Real>::Sqrt(fD3x*fD3x+fD3y*fD3y+fD3z*fD3z+fW3*fW3);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2*fLen3;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
if (Math<Real>::FAbs(fDet4) >= fScaledUncertainty)
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 20:21:32.913879668 -0700
@@ -72,7 +72,7 @@
Real fY2 = rkV2[1] - rkV0[1];
Real fZ2 = rkV2[2] - rkV0[2];
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -158,7 +158,7 @@
Real fW1 = fS1x*fD1x + fS1y*fD1y + fS1z*fD1z;
Real fW2 = fS2x*fD2x + fS2y*fD2y + fS2z*fD2z;
Real fW3 = fS3x*fD3x + fS3y*fD3y + fS3z*fD3z;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
return (fDet4 > (Real)0.0 ? 1 : (fDet4 < (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 20:21:36.845758502 -0700
@@ -48,7 +48,7 @@
Integer64 iY2 = (Integer64)rkV2[1] - (Integer64)rkV0[1];
Integer64 iZ2 = (Integer64)rkV2[2] - (Integer64)rkV0[2];
- Integer64 iDet3 = Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
+ Integer64 iDet3 = this->Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
return (iDet3 > 0 ? +1 : (iDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -100,7 +100,7 @@
Integer64 iW1 = iS1x*iD1x + iS1y*iD1y + iS1z*iD1z;
Integer64 iW2 = iS2x*iD2x + iS2y*iD2y + iS2z*iD2z;
Integer64 iW3 = iS3x*iD3x + iS3y*iD3y + iS3z*iD3z;
- Integer64 iDet4 = Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
+ Integer64 iDet4 = this->Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
iD2y,iD2z,iW2,iD3x,iD3y,iD3z,iW3);
return (iDet4 > 0 ? 1 : (iDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 19:42:01.192614333 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 20:21:48.905386855 -0700
@@ -49,7 +49,7 @@
TInteger<4> kY2((int)rkV2[1] - (int)rkV0[1]);
TInteger<4> kZ2((int)rkV2[2] - (int)rkV0[2]);
- TInteger<4> kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ TInteger<4> kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -96,7 +96,7 @@
TInteger<6> kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
TInteger<6> kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
TInteger<6> kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- TInteger<6> kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
+ TInteger<6> kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 20:21:41.135626300 -0700
@@ -136,7 +136,7 @@
Rational kY2 = m_akRVertex[iV2][1] - m_akRVertex[iV0][1];
Rational kZ2 = m_akRVertex[iV2][2] - m_akRVertex[iV0][2];
- Rational kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ Rational kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -208,7 +208,7 @@
Rational kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
Rational kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
Rational kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- Rational kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
+ Rational kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
kD2y,kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
freecad-glu.patch:
GLImageBox.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE freecad-glu.patch ---
diff -Naur freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp
--- freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp 2010-02-18 05:03:53.000000000 -0600
+++ freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-01 16:49:09.041859287 -0600
@@ -27,6 +27,7 @@
# include <GL/glext.h>
#endif
+#include <GL/glu.h>
#include "GLImageBox.h"
using namespace ImageGui;
freecad-system_inst.patch:
freecad-svn5184.mod/CMakeLists.txt | 15 +--
freecad-svn5184.mod/data/examples/CMakeLists.txt | 2
freecad-svn5184.mod/src/App/CMakeLists.txt | 8 +
freecad-svn5184.mod/src/Base/CMakeLists.txt | 3
freecad-svn5184.mod/src/Doc/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt | 8 -
freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt | 6 -
freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt | 10 --
freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt | 4
freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt | 5 -
freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt | 47 +++++-----
freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt | 12 +-
freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt | 21 ++--
freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt | 3
freecad-svn5220/src/App/CMakeLists.txt | 3
freecad-svn5220/src/Base/CMakeLists.txt | 4
freecad-svn5220/src/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Main/CMakeLists.txt | 7 +
freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 3
67 files changed, 171 insertions(+), 119 deletions(-)
--- NEW FILE freecad-system_inst.patch ---
diff -Naur freecad-svn5184.orig/CMakeLists.txt freecad-svn5184.mod/CMakeLists.txt
--- freecad-svn5184.orig/CMakeLists.txt 2011-11-30 09:36:58.969275770 -0600
+++ freecad-svn5184.mod/CMakeLists.txt 2011-11-30 16:07:00.353807219 -0600
@@ -61,11 +61,12 @@
if(WIN32)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
else(WIN32)
-# SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
+ SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad")
+ SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif(WIN32)
-# ================================================================================
-# == Win32 is default behaviour use the LibPack copied in Source tree ============
+# ==============================================================================
+# == Win32 is default behaviour use the LibPack copied in Source tree ==========
if(MSVC)
OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON)
set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack")
@@ -74,7 +75,7 @@
set(FREECAD_LIBPACK_DIR "" CACHE PATH "Directory of the FreeCAD LibPack")
endif(MSVC)
-# ================================================================================
+# ==============================================================================
# == All the options for the build process ============
OPTION(FREECAD_BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
@@ -82,10 +83,10 @@
OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
+SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
+SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
-
-
-# ================================================================================
+# ==============================================================================
if(FREECAD_LIBPACK_USE)
# checking for a unique file in LibPack location to make sure the right version of the LibPack is there
diff -Naur freecad-svn5184.orig/data/examples/CMakeLists.txt freecad-svn5184.mod/data/examples/CMakeLists.txt
--- freecad-svn5184.orig/data/examples/CMakeLists.txt 2011-05-24 14:02:32.000000000 -0500
+++ freecad-svn5184.mod/data/examples/CMakeLists.txt 2011-11-30 11:56:01.050240955 -0600
@@ -12,7 +12,7 @@
fc_copy_sources("data/examples" "Examples" ${Examples_Files})
-install(
+INSTALL(
FILES
${Examples_Files}
DESTINATION
diff -Naur freecad-svn5184.orig/src/App/CMakeLists.txt freecad-svn5184.mod/src/App/CMakeLists.txt
--- freecad-svn5184.orig/src/App/CMakeLists.txt 2011-06-14 09:11:52.000000000 -0500
+++ freecad-svn5184.mod/src/App/CMakeLists.txt 2011-11-30 16:08:36.464683016 -0600
@@ -3,6 +3,14 @@
add_definitions(-DBOOST_DYN_LINK)
endif(WIN32)
+IF(RESOURCEDIR)
+ add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
+ENDIF(RESOURCEDIR)
+
+IF(DOCDIR)
+ add_definitions(-DDOCDIR="${DOCDIR}")
+ENDIF(DOCDIR)
+
include_directories(
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
diff -Naur freecad-svn5184.orig/src/Base/CMakeLists.txt freecad-svn5184.mod/src/Base/CMakeLists.txt
--- freecad-svn5184.orig/src/Base/CMakeLists.txt 2011-01-26 05:56:38.000000000 -0600
+++ freecad-svn5184.mod/src/Base/CMakeLists.txt 2011-11-30 10:45:20.128198748 -0600
@@ -309,6 +309,9 @@
LIBRARY DESTINATION lib
)
else(WIN32)
+ set_target_properties(FreeCADBase
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5184.orig/src/Doc/CMakeLists.txt freecad-svn5184.mod/src/Doc/CMakeLists.txt
--- freecad-svn5184.orig/src/Doc/CMakeLists.txt 2011-01-28 08:38:53.000000000 -0600
+++ freecad-svn5184.mod/src/Doc/CMakeLists.txt 2011-11-30 10:38:04.225248987 -0600
@@ -1,5 +1,5 @@
find_package(Doxygen)
-if( DOXYGEN_FOUND)
+if(DOXYGEN_FOUND)
IF (DOXYGEN_DOT_EXECUTABLE)
SET(HAVE_DOT YES)
diff -Naur freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt 2011-10-14 11:48:44.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt 2011-11-30 11:57:29.541317665 -0600
@@ -30,9 +30,7 @@
fc_copy_sources("Mod/Arch" "Arch" ${all_files})
-install(
- FILES
- ${Arch_SRCS}
- DESTINATION
- Mod/Arch
+INSTALL(
+ FILES ${Arch_SRCS}
+ DESTINATION Mod/Arch
)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt 2011-11-30 11:00:47.662045120 -0600
@@ -38,6 +38,7 @@
else(MSVC)
set_target_properties(Complete PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(Complete PROPERTIES PREFIX "")
+ set_target_properties(Complete PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Complete DESTINATION lib)
+INSTALL(TARGETS Complete DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt 2011-11-30 10:57:26.092627644 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt 2011-02-02 09:56:18.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt 2011-11-30 11:03:20.932041683 -0600
@@ -34,14 +34,14 @@
fc_copy_sources("Mod/Draft" "Draft" ${all_files})
-install(
+
+INSTALL(
FILES
${DraftLibs_SRCS}
DESTINATION
Mod/Draft/draftlibs
)
-
-install(
+INSTALL(
FILES
${Draft_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt 2011-11-30 12:03:31.686356774 -0600
@@ -85,6 +85,7 @@
else(MSVC)
set_target_properties(Drawing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(Drawing PROPERTIES PREFIX "")
+ set_target_properties(Drawing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Drawing DESTINATION lib)
+INSTALL(TARGETS Drawing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt 2011-11-30 11:03:56.361884884 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt 2011-06-15 09:24:33.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt 2011-11-30 11:05:11.758423159 -0600
@@ -83,6 +83,7 @@
else(MSVC)
set_target_properties(DrawingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(DrawingGui PROPERTIES PREFIX "")
+ set_target_properties(DrawingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS DrawingGui DESTINATION lib)
+INSTALL(TARGETS DrawingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt 2011-03-31 10:38:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt 2011-11-30 11:24:22.670819700 -0600
@@ -79,6 +79,7 @@
else(MSVC)
set_target_properties(Fem PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(Fem PROPERTIES PREFIX "")
+ set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Fem DESTINATION lib)
+INSTALL(TARGETS Fem DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt 2010-11-23 07:25:34.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt 2011-11-30 11:23:00.206515462 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt 2011-11-30 11:23:44.905054292 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(FemGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(FemGui PROPERTIES PREFIX "")
+ set_target_properties(FemGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS FemGui DESTINATION lib)
+INSTALL(TARGETS FemGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt 2011-11-30 11:25:49.758972604 -0600
@@ -48,23 +48,21 @@
fc_copy_sources("Mod/Idf" "Idf" ${all_files})
-install(
+INSTALL(
FILES
${IdfLibs_SRCS}
DESTINATION
Mod/Idf/Idflibs
)
-
-install(
+INSTALL(
FILES
${IdfLang_SRCS}
DESTINATION
Mod/Idf/Languages
)
-
-install(
+INSTALL(
FILES
${Idf_SRCS}
DESTINATION
Mod/Idf
- )
+)
diff -Naur freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt 2011-01-25 09:40:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt 2011-11-30 11:27:17.458105233 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(Image PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(Image PROPERTIES PREFIX "")
+ set_target_properties(Image PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Image DESTINATION lib)
+INSTALL(TARGETS Image DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt 2011-11-30 11:26:36.060458740 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt 2011-01-24 12:06:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt 2011-11-30 11:27:58.559761333 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(ImageGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(ImageGui PROPERTIES PREFIX "")
+ set_target_properties(ImageGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImageGui DESTINATION lib)
+INSTALL(TARGETS ImageGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt 2011-01-04 06:35:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt 2011-11-30 11:28:45.368230781 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
DESTINATION
Mod/Import
-)
+)
diff -Naur freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt 2011-11-30 11:29:14.799268344 -0600
@@ -56,6 +56,7 @@
else(MSVC)
set_target_properties(ImportGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
set_target_properties(ImportGui PROPERTIES PREFIX "")
+ set_target_properties(ImportGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImportGui DESTINATION lib)
+INSTALL(TARGETS ImportGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt 2011-11-30 11:30:36.267604260 -0600
@@ -50,6 +50,7 @@
else(MSVC)
set_target_properties(Inspection PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
set_target_properties(Inspection PROPERTIES PREFIX "")
+ set_target_properties(Inspection PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-
-install(TARGETS Inspection DESTINATION lib)
+
+INSTALL(TARGETS Inspection DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt 2011-01-26 03:20:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt 2011-11-30 11:29:53.774993917 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt 2011-11-30 11:31:46.555305748 -0600
@@ -47,26 +47,27 @@
ViewProviderInspection.cpp
ViewProviderInspection.h
Workbench.cpp
- Workbench.h
-)
-
-add_library(InspectionGui SHARED ${InspectionGui_SRCS})
-target_link_libraries(InspectionGui ${InspectionGui_LIBS})
-fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
-
-if(MSVC)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "../")
-elseif(MINGW)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-else(MSVC)
- set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-endif(MSVC)
-
-install(TARGETS InspectionGui DESTINATION lib)
+ Workbench.h
+)
+
+add_library(InspectionGui SHARED ${InspectionGui_SRCS})
+target_link_libraries(InspectionGui ${InspectionGui_LIBS})
+fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
+
+if(MSVC)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "../")
+elseif(MINGW)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+else(MSVC)
+ set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+ set_target_properties(InspectionGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+endif(MSVC)
+
+INSTALL(TARGETS InspectionGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt 2011-05-20 09:39:48.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt 2011-11-30 11:33:47.854316080 -0600
@@ -347,6 +347,7 @@
else(MSVC)
set_target_properties(Mesh PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(Mesh PROPERTIES PREFIX "")
+ set_target_properties(Mesh PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Mesh DESTINATION lib)
+INSTALL(TARGETS Mesh DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt 2011-11-30 11:33:19.819243657 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt 2010-11-05 09:59:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt 2011-11-30 11:34:26.387041214 -0600
@@ -124,6 +124,7 @@
else(MSVC)
set_target_properties(MeshGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(MeshGui PROPERTIES PREFIX "")
+ set_target_properties(MeshGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshGui DESTINATION lib)
+INSTALL(TARGETS MeshGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt 2011-11-30 11:35:26.526051628 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(MeshPart PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPart PROPERTIES PREFIX "")
+ set_target_properties(MeshPart PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPart DESTINATION lib)
+INSTALL(TARGETS MeshPart DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt 2011-11-30 11:34:57.482012457 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt 2010-10-02 18:53:11.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt 2011-11-30 11:35:53.700152675 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(MeshPartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPartGui PROPERTIES PREFIX "")
+ set_target_properties(MeshPartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPartGui DESTINATION lib)
+INSTALL(TARGETS MeshPartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt 2011-11-30 11:36:57.685036101 -0600
@@ -252,6 +252,7 @@
else(MSVC)
set_target_properties(Part PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(Part PROPERTIES PREFIX "")
+ set_target_properties(Part PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Part DESTINATION lib)
+INSTALL(TARGETS Part DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt 2011-11-30 11:36:19.927285066 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt 2011-10-15 08:31:58.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt 2011-11-30 11:37:36.752743837 -0600
@@ -178,6 +178,7 @@
else(MSVC)
set_target_properties(PartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(PartGui PROPERTIES PREFIX "")
+ set_target_properties(PartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartGui DESTINATION lib)
+INSTALL(TARGETS PartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-22 04:37:02.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-30 11:38:57.340078457 -0600
@@ -105,6 +105,7 @@
else(MSVC)
set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesign PROPERTIES PREFIX "")
+ set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesign DESTINATION lib)
+INSTALL(TARGETS PartDesign DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt 2011-11-30 11:38:26.413101317 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-17 03:29:05.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-30 11:39:37.893737252 -0600
@@ -134,6 +134,7 @@
else(MSVC)
set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesignGui PROPERTIES PREFIX "")
+ set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesignGui DESTINATION lib)
+INSTALL(TARGETS PartDesignGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt 2011-11-30 11:41:17.777434173 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(Points PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(Points PROPERTIES PREFIX "")
+ set_target_properties(Points PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Points DESTINATION lib)
+INSTALL(TARGETS Points DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt 2011-11-30 11:40:18.488394768 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt 2011-11-30 11:42:01.941973792 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(PointsGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(PointsGui PROPERTIES PREFIX "")
+ set_target_properties(PointsGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PointsGui DESTINATION lib)
+INSTALL(TARGETS PointsGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt 2011-11-30 11:42:57.676130964 -0600
@@ -74,6 +74,7 @@
else(MSVC)
set_target_properties(Raytracing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(Raytracing PROPERTIES PREFIX "")
+ set_target_properties(Raytracing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Raytracing DESTINATION lib)
+INSTALL(TARGETS Raytracing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt 2011-11-30 11:42:29.349067575 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt 2011-11-30 11:43:26.181188497 -0600
@@ -89,6 +89,7 @@
else(MSVC)
set_target_properties(RaytracingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(RaytracingGui PROPERTIES PREFIX "")
+ set_target_properties(RaytracingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RaytracingGui DESTINATION lib)
+INSTALL(TARGETS RaytracingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt 2011-11-30 11:44:24.234269226 -0600
@@ -47,6 +47,7 @@
else(MSVC)
set_target_properties(ReverseEngineering PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineering PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineering PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ReverseEngineering DESTINATION lib)
+INSTALL(TARGETS ReverseEngineering DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt 2011-11-30 11:43:50.583381744 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt 2011-11-30 11:45:31.977029697 -0600
@@ -137,6 +137,7 @@
else(MSVC)
set_target_properties(Robot PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(Robot PROPERTIES PREFIX "")
+ set_target_properties(Robot PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Robot DESTINATION lib)
+INSTALL(TARGETS Robot DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt 2011-11-30 11:45:04.496938137 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt 2011-11-30 11:46:01.680047793 -0600
@@ -162,6 +162,7 @@
else(MSVC)
set_target_properties(RobotGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(RobotGui PROPERTIES PREFIX "")
+ set_target_properties(RobotGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RobotGui DESTINATION lib)
+INSTALL(TARGETS RobotGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt 2011-11-30 11:47:17.199551470 -0600
@@ -46,6 +46,7 @@
else(MSVC)
set_target_properties(Sandbox PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(Sandbox PROPERTIES PREFIX "")
+ set_target_properties(Sandbox PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sandbox DESTINATION lib)
+INSTALL(TARGETS Sandbox DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt 2010-08-24 06:42:52.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt 2011-11-30 11:46:39.023813388 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
- FILES
- Init.py
- InitGui.py
- DESTINATION
- Mod/Sandbox
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ DESTINATION
+ Mod/Sandbox
)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-07-08 08:07:49.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-11-30 11:47:59.296160060 -0600
@@ -57,6 +57,7 @@
else(MSVC)
set_target_properties(SandboxGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(SandboxGui PROPERTIES PREFIX "")
+ set_target_properties(SandboxGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SandboxGui DESTINATION lib)
+INSTALL(TARGETS SandboxGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt 2011-09-07 09:40:01.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt 2011-11-30 11:48:49.511500367 -0600
@@ -121,6 +121,7 @@
else(MSVC)
set_target_properties(Sketcher PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(Sketcher PROPERTIES PREFIX "")
+ set_target_properties(Sketcher PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sketcher DESTINATION lib)
+INSTALL(TARGETS Sketcher DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt 2011-11-30 11:48:21.240434767 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-10-03 17:57:56.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-11-30 11:49:16.609604780 -0600
@@ -113,6 +113,7 @@
else(MSVC)
set_target_properties(SketcherGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(SketcherGui PROPERTIES PREFIX "")
+ set_target_properties(SketcherGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SketcherGui DESTINATION lib)
+INSTALL(TARGETS SketcherGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt 2011-05-16 11:06:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt 2011-11-30 11:50:12.614753899 -0600
@@ -37,6 +37,7 @@
else(MSVC)
set_target_properties(Start PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(Start PROPERTIES PREFIX "")
+ set_target_properties(Start PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Start DESTINATION lib)
+INSTALL(TARGETS Start DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt 2011-11-30 19:08:17.276035136 -0600
@@ -2,9 +2,10 @@
add_subdirectory(App)
if(FREECAD_BUILD_GUI)
add_subdirectory(Gui)
+ add_subdirectory(StartPage)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt 2011-09-13 09:34:13.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt 2011-11-30 11:50:41.919785412 -0600
@@ -70,6 +70,7 @@
else(MSVC)
set_target_properties(StartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(StartGui PROPERTIES PREFIX "")
+ set_target_properties(StartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS StartGui DESTINATION lib)
+INSTALL(TARGETS StartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt 2011-08-08 14:17:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt 2011-11-30 11:51:17.723602252 -0600
@@ -9,13 +9,14 @@
DocumentObject.py
)
-install(
- FILES
- Init.py
- InitGui.py
- Commands.py
- FeaturePython.py
- PythonQt.py
- Tests.py
- DESTINATION
- Mod/TemplatePyMod)
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ Commands.py
+ FeaturePython.py
+ PythonQt.py
+ Tests.py
+ DESTINATION
+ Mod/TemplatePyMod
+)
diff -Naur freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt 2011-07-13 05:10:30.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt 2011-11-30 11:51:58.554253017 -0600
@@ -20,7 +20,7 @@
fc_copy_sources("Mod/Test" "Test" ${Test_SRCS})
-install(
+INSTALL(
FILES
${Test_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt 2011-11-30 11:52:37.617962226 -0600
@@ -65,6 +65,7 @@
else(MSVC)
set_target_properties(QtUnitGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
set_target_properties(QtUnitGui PROPERTIES PREFIX "")
+ set_target_properties(QtUnitGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS QtUnitGui DESTINATION lib)
+INSTALL(TARGETS QtUnitGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt 2011-11-30 11:53:02.772131074 -0600
@@ -3,7 +3,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt 2011-11-30 11:54:00.295230454 -0600
@@ -52,6 +52,7 @@
else(MSVC)
set_target_properties(WebGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
set_target_properties(WebGui PROPERTIES PREFIX "")
+ set_target_properties(WebGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS WebGui DESTINATION lib)
+INSTALL(TARGETS WebGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt 2011-12-05 10:20:10.830553148 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(CompleteGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(CompleteGui PROPERTIES PREFIX "")
+ set_target_properties(CompleteGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
install(TARGETS CompleteGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2011-12-05 10:50:21.815925156 -0600
@@ -54,6 +54,9 @@
else(MSVC)
set_target_properties(ReverseEngineeringGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineeringGui
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
endif(MSVC)
install(TARGETS ReverseEngineeringGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/App/CMakeLists.txt freecad-svn5220/src/App/CMakeLists.txt
--- freecad-svn5220.orig/src/App/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/App/CMakeLists.txt 2011-12-05 13:35:16.637348028 -0600
@@ -184,6 +184,7 @@
set_target_properties(FreeCADApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADApp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADApp PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -192,7 +193,7 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- INSTALL(TARGETS FreeCADApp
+ INSTALL(TARGETS FreeCADApp
LIBRARY DESTINATION lib
)
endif(WIN32)
diff -Naur freecad-svn5220.orig/src/Base/CMakeLists.txt freecad-svn5220/src/Base/CMakeLists.txt
--- freecad-svn5220.orig/src/Base/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/Base/CMakeLists.txt 2011-12-05 13:37:27.551041426 -0600
@@ -301,6 +301,7 @@
set_target_properties(FreeCADBase PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADBase PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADBase PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -309,9 +310,6 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- set_target_properties(FreeCADBase
- PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
- )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5220.orig/src/Gui/CMakeLists.txt freecad-svn5220/src/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Gui/CMakeLists.txt 2011-07-25 09:59:26.000000000 -0500
+++ freecad-svn5220/src/Gui/CMakeLists.txt 2011-12-05 13:35:57.316009531 -0600
@@ -830,6 +830,7 @@
set_target_properties(FreeCADGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
diff -Naur freecad-svn5220.orig/src/Main/CMakeLists.txt freecad-svn5220/src/Main/CMakeLists.txt
--- freecad-svn5220.orig/src/Main/CMakeLists.txt 2011-08-07 06:09:01.000000000 -0500
+++ freecad-svn5220/src/Main/CMakeLists.txt 2011-12-05 13:42:07.577838112 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(FreeCADMain PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMain PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMain PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -99,6 +100,7 @@
else(MSVC)
set_target_properties(FreeCADMainCmd PROPERTIES OUTPUT_NAME "FreeCADCmd")
set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMainCmd PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -140,6 +142,7 @@
set_target_properties(FreeCADMainPy PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMainPy PROPERTIES PREFIX "")
set_target_properties(FreeCADMainPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADMainPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -178,10 +181,12 @@
set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
else(MSVC)
set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -194,4 +199,4 @@
LIBRARY DESTINATION lib
)
endif(WIN32)
-endif(FREECAD_BUILD_GUI)
\ No newline at end of file
+endif(FREECAD_BUILD_GUI)
--- NEW FILE freecad.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH FREECAD 1 "July 25, 2007" freecad "Linux User's Manual"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
freecad \- An extensible Open Source CAx program for Unix/X11
.SH SYNOPSIS
.B freecad
.RI [ options ] " files"
.br
.B freecadcmd
.RI [ options ] " files"
.SH DESCRIPTION
.B FreeCAD
is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features
some key concepts like macro recording, workbenches, ability to run as a
server and dynamically loadable application extensions and it is designed
to be platform independent.
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH USAGE
\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of the options supported by \fBfreecad\fR is included below.
.SS "Generic options"
.TP
\fB\-h, \-\-help\fR
Show summary of options.
.TP
\fB\-v, \-\-version\fR
Show version of program.
.TP
\fB\-c, \-\-console\fR
Start in console mode.
.TP
\fB\-\-response\-file\fR \fIarg\fR
Can be specified with '@name', too.
.SS "Configuration"
.TP
\fB\-l, \-\-write\-log\fR
Write a log file.
.TP
\fB\-t, \-\-run\-test\fR \fIarg\fR
Test level.
.TP
\fB\-M, \-\-module\-path\fR \fIarg\fR
Additional module path.
.TP
\fB\-P, \-\-python\-path\fR \fIarg\fR
Additional Python path.
.SH SEE ALSO
To get more information about \fBFreeCAD\fR, please visit \fIhttp://juergen\-riegel.net/FreeCAD/Docu/index.php/Main_Page\fR
.SH BUGS
To report a bug, please visit \fIhttp://free-cad.sf.net/\fR
.SH AUTHOR
This manual page was written by Werner Mayer.
--- NEW FILE freecad.desktop ---
[Desktop Entry]
Version=1.0
Name=FreeCAD
Name[de]=FreeCAD
Comment=Feature based Parametric Modeler
Comment[de]=Feature-basierter parametrischer Modellierer
GenericName=CAD Application
GenericName[de]=CAD-Anwendung
Exec=/usr/bin/FreeCAD %F
Path=/usr/@lib@/freecad
Terminal=false
Type=Application
Icon=freecad
Categories=Graphics;Science;Education;Engineering;
StartupNotify=true
GenericName[de_DE]=Feature-basierter parametrischer Modellierer
MimeType=application/x-extension-fcstd;
--- NEW FILE freecad.spec ---
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web
# This revision is 0.12 final.
%global svnrev 5284
# Use update cmake package on EL builds.
%if 0%{?el6}
%global cmake %cmake28
%endif
# Some configuration options for other environments
# rpmbuild --with=occ: Compile using OpenCASCADE instead of OCE
%global occ %{?_with_occ: 1} %{?!_with_occ: 0}
# rpmbuild --with=bundled_zipios: use bundled version of zipios++
%global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 0}
# rpmbuild --with=bundled_pycxx: use bundled version of pycxx
%global bundled_pycxx %{?_with_bundled_pycxx: 1} %{?!_with_bundled_pycxx: 0}
# rpmbuild --with=bundled_smesh: use bundled version of Salome's Mesh
%global bundled_smesh %{?_with_bundled_smesh: 1} %{?!_with_bundled_smesh: 0}
Name: freecad
Version: 0.12
Release: 7%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
# This package must go in the non-free repository because of its dependence
# on OCE which is considered non-free.
License: GPLv3+ with exception
URL: http://sourceforge.net/apps/mediawiki/free-cad/
Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{svnrev}.ta...
Source101: freecad.desktop
Source102: freecad.1
# Patches 0 & 2 accepted upstream.
# https://sourceforge.net/apps/mantisbt/free-cad/view.php?id=519
# Fix a bunch of rpath issues and other tweaks.
Patch0: freecad-system_inst.patch
# Remove bundled libs from cmake configuration.
Patch1: freecad-3rdParty.patch
# Fix incomplete cmake config.
Patch2: freecad-StartPage.patch
# Fixed in svn
Patch3: freecad-glu.patch
# Disable unfinished modules.
Patch4: freecad-cmake_Mod_fix.patch
# Unbundle zipios++
Patch5: freecad-0.12-zipios.patch
# Patch for gcc 4.7
Patch6: freecad-gcc-4.7.patch
# Add build option for OpenCASCADE
Patch7: freecad-0.12-OpenCASCADE-option.patch
# Unbundle PyCXX
Patch8: freecad-0.12-pycxx.patch
# f2c is only needed for smesh, and maybe not even there
Patch9: freecad-0.12-rm_f2c.patch
# Utilities
BuildRequires: cmake doxygen swig
BuildRequires: gcc-gfortran
BuildRequires: gettext
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
# Development Libraries
BuildRequires: freeimage-devel
BuildRequires: libXmu-devel
BuildRequires: mesa-libGLU-devel
%if %{occ}
BuildRequires: OpenCASCADE-devel
%else
BuildRequires: OCE-devel
%endif
# Not yet in Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=665733
#BuildRequires: Coin3-devel
BuildRequires: Coin2-devel
BuildRequires: python2-devel
BuildRequires: boost-devel
BuildRequires: eigen3-devel
BuildRequires: qt-devel qt-webkit-devel
BuildRequires: SoQt-devel
# Not used yet.
#BuildRequires: ode-devel
BuildRequires: xerces-c xerces-c-devel
BuildRequires: libspnav-devel
#BuildRequires: opencv-devel
%if ! %{bundled_smesh}
BuildRequires: smesh-devel
%endif
%if ! %{bundled_zipios}
BuildRequires: zipios++-devel
%endif
%if ! %{bundled_pycxx}
BuildRequires: python-pycxx-devel
%endif
# Needed for plugin support and is not a soname dependency.
Requires: python-pivy
Requires: hicolor-icon-theme
# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
# prevent private capabilities being advertised in Provides/Requires
%define plugin_regexp /^\\\(libFreeCAD.*%(for i in %{plugins}; do echo -n "\\\|$i\\\|$iGui"; done)\\\)\\\(\\\|Gui\\\)\\.so/d
%{?filter_setup:
%filter_provides_in %{_libdir}/%{name}/lib
%filter_from_requires %{plugin_regexp}
%filter_from_provides %{plugin_regexp}
%filter_setup
}
%description
FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed
directly at mechanical engineering and product design but also fits a wider
range of uses in engineering, such as architecture or other engineering
specialties. It is a feature-based parametric modeler with a modular software
architecture which makes it easy to provide additional functionality without
modifying the core system.
%package doc
Summary: Extended documentation for FreeCAD
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: qt-assistant
%description doc
End user documentation for FreeCAD
%prep
%setup -q -n FreeCAD-%{version}.%{svnrev}
%patch0 -p1 -b .sysinst
%patch1 -p1 -b .3rdparty
%patch2 -p1 -b .startpage
%patch3 -p1 -b .glufix
%patch4 -p1 -b .modfix
%patch5 -p1 -b .zipios
%patch6 -p1 -b .gcc47
%patch7 -p1 -b .OCC
# Remove bundled pycxx if we're not using it
%if ! %{bundled_pycxx}
%patch8 -p1 -b .pycxx
rm -rf src/CXX
%endif
%patch9 -p1 -b .f2c
# Fix encodings
dos2unix -k src/Mod/Test/unittestgui.py \
ChangeLog.txt \
copying.lib \
data/License.txt
# Removed bundled libraries
rm -rf src/3rdParty
%build
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/freecad \
-DRESOURCEDIR=%{_libdir}/freecad \
-DDOCDIR=%{_docdir}/%{name} \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
-DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
%if %{occ}
-DUSE_OCC=TRUE \
%endif
%if ! %{bundled_smesh}
-DSMESH_INCLUDE_DIR=%{_includedir} \
%endif
%if ! %{bundled_zipios}
-DUSE_EXTERNAL_ZIPIOS=TRUE \
%endif
%if ! %{bundled_pycxx}
-DPYCXX_INCLUDE_DIR=$(pkg-config --variable=includedir PyCXX) \
-DPYCXX_SOURCE_DIR=$(pkg-config --variable=srcdir PyCXX) \
%endif
../
make %{?_smp_mflags}
%install
pushd build
make install DESTDIR=%{buildroot}
popd
# Symlink binaries to /usr/bin
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_bindir}
ln -s ../%{_lib}/freecad/bin/FreeCAD .
ln -s ../%{_lib}/freecad/bin/FreeCADCmd .
popd
# Fix problems with unittestgui.py
chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py
# Install desktop file
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE101}
sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop
# Install desktop icon
install -pD -m 0644 src/Gui/Icons/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# Install man page
install -pD -m 0644 %{SOURCE102} \
%{buildroot}%{_mandir}/man1/%{name}.1
# Symlink manpage to other binary names
pushd %{buildroot}%{_mandir}/man1
ln -sf %{name}.1.gz FreeCAD.1.gz
ln -sf %{name}.1.gz FreeCADCmd.1.gz
popd
# Install QT Assistant documentation
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 build/doc/freecad.* %{buildroot}%{_docdir}/%{name}/
# Bug maintainers to keep %%{plugins} macro up to date.
#
# Make sure there are no plugins that need to be added to plugins macro
new_plugins=`ls %{buildroot}%{_libdir}/freecad/lib | sed -e '%{plugin_regexp}'`
if [ -n "$new_plugins" ]; then
echo -e "\n\n\n**** ERROR:\n" \
"\nPlugins not caught by regexp: " $new_plugins \
"\n\nPlugins in %{_libdir}/freecad/lib do not exist in" \
"\nspecfile %%{plugins} macro. Please add these to" \
"\n%%{plugins} macro at top of specfile and rebuild.\n****\n" 1>&2
exit 1
fi
# Make sure there are no entries in the plugins macro that don't match plugins
for p in %{plugins}; do
if [ -z "`ls %{buildroot}%{_libdir}/freecad/lib/$p*.so`" ]; then
set +x
echo -e "\n\n\n**** ERROR:\n" \
"\nExtra entry in %%{plugins} macro with no matching plugin:" \
"'$p'.\n\nPlease remove from %%{plugins} macro at top of" \
"\nspecfile and rebuild.\n****\n" 1>&2
exit 1
fi
done
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bin/
%{_libdir}/%{name}/data/
%{_libdir}/%{name}/lib/
%{_libdir}/%{name}/Mod/
%{_mandir}/man1/*.1.gz
%files doc
%{_docdir}/%{name}
%changelog
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %%doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-6
- Filter out automatically generated Provides/Requires of private libraries
- freecad.desktop not passing 'desktop-file-validate'; fixed
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-5
- New patch to unbundle PyCXX
- Add conditional build options for OpenCASCADE, bundled Zipios++,
bundled PyCXX, bundled smesh
* Tue Jun 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-4
- Add linker flag to stop excessive linking.
* Thu May 31 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-3
- Add patch for GCC 4.7 on Fedora 17.
* Thu Nov 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-2
- Initial release.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/F-17/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Jul 2012 21:00:42 -0000 1.1
+++ sources 7 Jul 2012 13:48:36 -0000 1.2
@@ -0,0 +1 @@
+fcd91286c578a219491ffebb2111bddf freecad-0.12.5284.tar.gz
12 years, 4 months
- 1
- 0
rpms/gmameui/devel .cvsignore, 1.5, 1.6 gmameui.spec, 1.7, 1.8 sources, 1.5, 1.6
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5209
Modified Files:
.cvsignore gmameui.spec sources
Log Message:
* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
gmamui relies on some old gnome-icons-theme, cleans icons errors.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 5 Jul 2012 19:05:44 -0000 1.5
+++ .cvsignore 7 Jul 2012 13:38:38 -0000 1.6
@@ -1 +1,2 @@
gmameui-gmameui20120704cvs.tar.gz
+missingicons.tbz
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/gmameui.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gmameui.spec 5 Jul 2012 19:05:45 -0000 1.7
+++ gmameui.spec 7 Jul 2012 13:38:38 -0000 1.8
@@ -1,12 +1,14 @@
Summary: Frontend for MAME
Name: gmameui
Version: 0.2.13
-Release: 0.1.20120704cvs%{?dist}
+Release: 0.2.20120704cvs%{?dist}
License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
Source0: gmameui-gmameui20120704cvs.tar.gz
+#from gnome-icon-theme-gperfection2-2.3-1.noarch.rpm
+Source1: missingicons.tbz
Patch0: gmameui-0.2.12-fix.patch
Patch2: gmameui-fix3.patch
Patch3: gmameui-fix4.patch
@@ -32,6 +34,7 @@
%prep
%setup -q -n gmameui
+%setup -a1 -qn gmameui
%patch0 -p1 -b .fix
%patch2 -p0 -b .fix3
%patch3 -p0 -b .fix4
@@ -53,6 +56,13 @@
%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
+# Install missing icons
+#%{__cp} emblem-distinguished.png emblem-sound.png stock_unknown.png stock_filter-navigator.png \
+#stock_toggle-preview.png stock_list_enum-off.png %{buildroot}%{_datadir}/gmameui/
+
+%{__cp} gmameui-view-list.png gmameui-view-filters.png gmameui-view-screenshot.png \
+gmameui-emblem-unknown.png gmameui-emblem-played.png gmameui-emblem-sound.png \
+%{buildroot}%{_datadir}/gmameui/
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -67,6 +77,10 @@
%changelog
+* Sat Jul 07 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.2.20120704cvs
+- add missing icons, extract from gnome-icon-theme-gperfection2_2.3-0ubuntu3_all.deb
+ gmamui relies on some old gnome-icons-theme, cleans icons errors.
+
* Wed Jul 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec :
- Updated the license tag to GPLv3+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 5 Jul 2012 19:05:45 -0000 1.5
+++ sources 7 Jul 2012 13:38:38 -0000 1.6
@@ -1 +1,2 @@
10ecddacd3239b395f84bd034bc5531e gmameui-gmameui20120704cvs.tar.gz
+ccc3410c5885692bc7b28a27fce3e9f6 missingicons.tbz
12 years, 4 months
- 1
- 0
rpms/freecad/devel freecad-0.12-OpenCASCADE-option.patch, NONE, 1.1 freecad-0.12-pycxx.patch, NONE, 1.1 freecad-0.12-rm_f2c.patch, NONE, 1.1 freecad-0.12-zipios.patch, NONE, 1.1 freecad-3rdParty.patch, NONE, 1.1 freecad-StartPage.patch, NONE, 1.1 freecad-cmake_Mod_fix.patch, NONE, 1.1 freecad-gcc-4.7.patch, NONE, 1.1 freecad-glu.patch, NONE, 1.1 freecad-system_inst.patch, NONE, 1.1 freecad.1, NONE, 1.1 freecad.desktop, NONE, 1.1 freecad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/freecad/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5947
Modified Files:
.cvsignore sources
Added Files:
freecad-0.12-OpenCASCADE-option.patch freecad-0.12-pycxx.patch
freecad-0.12-rm_f2c.patch freecad-0.12-zipios.patch
freecad-3rdParty.patch freecad-StartPage.patch
freecad-cmake_Mod_fix.patch freecad-gcc-4.7.patch
freecad-glu.patch freecad-system_inst.patch freecad.1
freecad.desktop freecad.spec
Log Message:
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
freecad-0.12-OpenCASCADE-option.patch:
CMakeLists.txt | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
--- NEW FILE freecad-0.12-OpenCASCADE-option.patch ---
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-24 01:14:02.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-24 01:18:52.000000000 -0500
@@ -163,15 +163,20 @@
#first, look for OpenCASCADE Community Edition (OCE)
#if OCE is installed in a nonstandard location, add -DOCE_DIR=/path/to/dir/containing/OCEConfig.cmake
# when configuring with cmake, i.e. cmake .. -DOCE_DIR=/usr/share/cmake
- if( NOT DEFINED OCE_DIR )
- if( UNIX )
- set( OCE_DIR "/usr/local/share/cmake/" )
- else()
- set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ if( NOT DEFINED USE_OCC )
+ if( NOT DEFINED OCE_DIR )
+ if( UNIX )
+ set( OCE_DIR "/usr/local/share/cmake/" )
+ else()
+ set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
+ endif()
endif()
+ find_package ( OCE )
+ else()
+ set(OCE_FOUND FALSE)
+
endif()
- find_package ( OCE )
- if( ${OCE_FOUND} )
+ if( ${OCE_FOUND} AND NOT DEFINED USE_OCC )
message("-- OpenCASCADE Community Edition has been found.")
add_definitions ( -DHAVE_CONFIG_H )
set( OCC_LIBRARIES "TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
freecad-0.12-pycxx.patch:
CMakeLists.txt | 12 +++++
cMake/FindPyCXX.cmake | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
src/Base/CMakeLists.txt | 21 ++-------
3 files changed, 124 insertions(+), 16 deletions(-)
--- NEW FILE freecad-0.12-pycxx.patch ---
This patch adds an option to FreeCAD's cmake to specify an external
PyCXX. PyCXX doesn't really have a standard location, so this will try
to guess a couple of places, but best is to specify on the cmake command
line:
cmake -DPYCXX_INCLUDE_DIR=/usr/include/python2.7 \
-DPYCXX_SOURCE_DIR=/usr/share/python2.7/CXX
diff -ruN FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-06-25 01:32:19.000000000 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-06-25 01:30:48.000000000 -0500
@@ -86,6 +86,13 @@
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
+SET(PYCXX_INCLUDE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src" CACHE PATH
+ "Path to the directory containing PyCXX's CXX/Config.hxx include file")
+SET(PYCXX_SOURCE_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/src/CXX" CACHE PATH
+ "Path to the directory containing PyCXX's cxxextensions.c source file")
+
# ==============================================================================
@@ -158,6 +165,11 @@
find_package(ZLIB REQUIRED)
+# -------------------------------- PyCXX --------------------------------
+
+ find_package(PyCXX REQUIRED)
+
+
# -------------------------------- OpenCasCade --------------------------------
#first, look for OpenCASCADE Community Edition (OCE)
diff -ruN FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake FreeCAD-0.12.5284/cMake/FindPyCXX.cmake
--- FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake 1969-12-31 18:00:00.000000000 -0600
+++ FreeCAD-0.12.5284/cMake/FindPyCXX.cmake 2012-06-25 01:30:25.000000000 -0500
@@ -0,0 +1,107 @@
+# Locate PyCXX headers and source files
+
+# This module defines
+# PYCXX_INCLUDE_DIR
+# PYCXX_SOURCE_DIR
+# PYCXX_FOUND
+# PYCXX_SOURCES
+#
+# The PYCXX_*_DIR variables can be set to tell this module where
+# the files are.
+
+
+# There's no standard location for PyCXX.
+#
+# The authors' example is to put it in "~\" [sic].
+#
+# Ubuntu puts the includes into /usr/include/python2.7/CXX and sources into
+# /usr/share/python2.7/CXX.
+#
+# The Zultron Fedora RPM does the same as Ubuntu.
+
+set(PYCXX_FOUND "YES")
+
+# find the header directory
+if(PYCXX_INCLUDE_DIR)
+ # headers better be in there
+ if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
+else(PYCXX_INCLUDE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_INCLUDE_DIR CXX/Config.hxx
+ ${PYTHON_INCLUDE_DIR}
+ "${CMAKE_CURRENT_LIST_DIR}/..")
+ if(NOT PYCXX_INCLUDE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
+ "the location of CXX/Config.hxx")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_INCLUDE_DIR)
+endif(PYCXX_INCLUDE_DIR)
+
+# find the sources directory
+if(PYCXX_SOURCE_DIR)
+ # source directory specified, they'd better be there
+ if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(WARNING
+ "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
+ "${PYCXX_INCLUDE_DIR}")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
+else(PYCXX_SOURCE_DIR)
+ # check in 'standard' places
+ find_path(PYCXX_SOURCE_DIR cxxextensions.c
+ "${PYCXX_INCLUDE_DIR}/CXX"
+ "${PYCXX_INCLUDE_DIR}/Src"
+ "${PYTHON_INCLUDE_DIR}/CXX"
+ "${PYTHON_INCLUDE_DIR}/Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../Src"
+ "${CMAKE_CURRENT_LIST_DIR}/../CXX")
+ if(NOT PYCXX_SOURCE_DIR)
+ if(PYCXX_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR
+ "PyCXX not found; please set PYCXX_SOURCE_DIR to "
+ "the location of cxxextensions.c")
+ else(PYCXX_FIND_REQUIRED)
+ MESSAGE(STATUS "PyCXX not found")
+ unset(PYCXX_FOUND)
+ endif(PYCXX_FIND_REQUIRED)
+ endif(NOT PYCXX_SOURCE_DIR)
+endif(PYCXX_SOURCE_DIR)
+
+# see what we've got
+if(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX found:")
+ MESSAGE(STATUS " Headers: ${PYCXX_INCLUDE_DIR}")
+ MESSAGE(STATUS " Sources: ${PYCXX_SOURCE_DIR}")
+
+ # Build the list of sources for convenience
+ set(PYCXX_SOURCES
+ ${PYCXX_SOURCE_DIR}/cxxextensions.c
+ ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
+ ${PYCXX_SOURCE_DIR}/cxxsupport.cxx
+ ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
+ )
+else(PYCXX_FOUND)
+ MESSAGE(STATUS "PyCXX not found")
+endif(PYCXX_FOUND)
diff -ruN FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-06-25 01:32:18.000000000 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-06-25 01:31:09.000000000 -0500
@@ -121,21 +121,6 @@
)
SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
-SET(pycxx_SRCS
- ../CXX/Config.hxx
- ../CXX/cxxextensions.c
- ../CXX/cxx_extensions.cxx
- ../CXX/cxxsupport.cxx
- ../CXX/Exception.hxx
- ../CXX/Extensions.hxx
- ../CXX/IndirectPythonInterface.cxx
- ../CXX/IndirectPythonInterface.hxx
- ../CXX/Objects.hxx
- ../CXX/Version.hxx
- ../CXX/WrapPython.h
-)
-SOURCE_GROUP("pycxx" FILES ${pycxx_SRCS})
-
SET(FreeCADBase_XML_SRCS
BaseClassPy.xml
BoundBoxPy.xml
@@ -269,7 +254,6 @@
)
SET(FreeCADBase_SRCS
- ${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
${FreeCADBase_XML_SRCS}
@@ -301,6 +285,11 @@
endif(USE_EXTERNAL_ZIPIOS)
+include_directories(${PYCXX_INCLUDE_DIR})
+list(APPEND FreeCADBase_SRCS ${PYCXX_SOURCES})
+SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES})
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-0.12-rm_f2c.patch:
CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
--- NEW FILE freecad-0.12-rm_f2c.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-07-05 08:47:37.921080779 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-07-05 15:28:53.615339177 -0500
@@ -204,12 +204,6 @@
ENDIF()
endif()
-# -------------------------------- f2c ----------------------------------
-
- IF(OCC_FOUND)
- find_package(F2C REQUIRED)
- ENDIF(OCC_FOUND)
-
# -------------------------------- Salome SMESH --------------------------
# Salome SMESH sources are under src/3rdParty now
freecad-0.12-zipios.patch:
CMakeLists.txt | 1 +
src/Base/CMakeLists.txt | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
--- NEW FILE freecad-0.12-zipios.patch ---
diff -Naur FreeCAD-0.12.5284.orig/CMakeLists.txt FreeCAD-0.12.5284/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/CMakeLists.txt 2012-04-08 07:23:26.474216557 -0500
+++ FreeCAD-0.12.5284/CMakeLists.txt 2012-04-08 19:14:13.606167248 -0500
@@ -85,6 +85,7 @@
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
+OPTION(USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
# ==============================================================================
diff -Naur FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt FreeCAD-0.12.5284/src/Base/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Base/CMakeLists.txt 2012-04-08 07:23:26.514215262 -0500
+++ FreeCAD-0.12.5284/src/Base/CMakeLists.txt 2012-04-08 19:12:39.956997353 -0500
@@ -269,7 +269,6 @@
)
SET(FreeCADBase_SRCS
- ${zipios_SRCS}
${pycxx_SRCS}
${FreeCADBase_CPP_SRCS}
${FreeCADBase_HPP_SRCS}
@@ -281,6 +280,27 @@
PreCompiled.h
)
+# Use external zipios++ if specified.
+if(USE_EXTERNAL_ZIPIOS)
+ find_library(ZIPIOS_LIBRARY zipios)
+ find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
+ if(ZIPIOS_LIBRARY)
+ message(STATUS "Found zipios++: ${ZIPIOS}")
+ endif()
+ if(ZIPIOS_INCLUDES)
+ message(STATUS "Found zipios++ headers.")
+ endif()
+ if(ZIPIOS_LIBRARY AND ZIPIOS_INCLUDES)
+ list(APPEND FreeCADBase_LIBS ${ZIPIOS_LIBRARY})
+ include_directories(${ZIPIOS_INCLUDES})
+ else()
+ message(FATAL_ERROR "Using external zipios++ was specified but was not found.")
+ endif()
+else(USE_EXTERNAL_ZIPIOS)
+ list(APPEND FreeCADBase_SRCS ${zipios_SRCS})
+endif(USE_EXTERNAL_ZIPIOS)
+
+
if(MSVC)
add_definitions(-D_PreComp_)
ADD_MSVC_PRECOMPILED_HEADER("PreCompiled.h" "PreCompiled.cpp" FreeCADBase_CPP_SRCS)
freecad-3rdParty.patch:
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE freecad-3rdParty.patch ---
diff -Naur freecad-0.12-svn5325.orig/src/CMakeLists.txt freecad-0.12-svn5325/src/CMakeLists.txt
--- freecad-0.12-svn5325.orig/src/CMakeLists.txt 2011-03-03 09:57:25.000000000 -0600
+++ freecad-0.12-svn5325/src/CMakeLists.txt 2011-12-21 10:58:18.396896819 -0600
@@ -1,6 +1,5 @@
add_subdirectory(Build)
-add_subdirectory(3rdParty)
add_subdirectory(Base)
add_subdirectory(App)
add_subdirectory(Main)
freecad-StartPage.patch:
CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
--- NEW FILE freecad-StartPage.patch ---
diff -Naur freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/StartPage/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Start/StartPage/CMakeLists.txt 2011-11-30 19:07:40.962208203 -0600
@@ -0,0 +1,31 @@
+SET(StartPage_SRCS
+ StartPage.py
+ __init__.py
+)
+
+SET(StartPage_DATA
+ ArchDesign.py
+ DefaultWorkbench.py
+ LoadDrawingExample.py
+ LoadPartDesignExample.py
+ LoadRobotExample.py
+ LoadSchenkel.py
+ LoadMRU0.py
+ LoadMRU1.py
+ LoadMRU2.py
+ Mesh.py
+ PartDesign.py
+ Background.jpg
+ FreeCAD.png
+ PartDesign.png
+ ArchDesign.png
+ Mesh.png
+ Complete.png
+ PartDesignExample.png
+ ArchExample.png
+ web.png
+)
+
+INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA}
+ DESTINATION Mod/Start/StartPage
+)
freecad-cmake_Mod_fix.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE freecad-cmake_Mod_fix.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt
--- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 06:26:12.000000000 -0600
+++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-04 11:39:26.918349340 -0600
@@ -18,7 +18,7 @@
MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built")
MESSAGE("Due to the missing Eigen3 library the Robot module won't be built")
ENDIF(EIGEN3_FOUND)
-add_subdirectory(Machining_Distortion)
+#add_subdirectory(Machining_Distortion)
add_subdirectory(ReverseEngineering)
add_subdirectory(MeshPart)
@@ -32,7 +32,7 @@
add_subdirectory(Arch)
-add_subdirectory(Assembly)
+#add_subdirectory(Assembly)
if(FREECAD_BUILD_CAM)
add_subdirectory(Cam)
freecad-gcc-4.7.patch:
Fem/App/HypothesisPy.cpp | 18 +++++++++---------
Mesh/App/WildMagic4/Wm4Query2.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query2TRational.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Filtered.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3Int64.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TInteger.inl | 4 ++--
Mesh/App/WildMagic4/Wm4Query3TRational.inl | 4 ++--
11 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE freecad-gcc-4.7.patch ---
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp
--- FreeCAD-0.12.5284.orig/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 19:42:01.240612805 -0700
+++ FreeCAD-0.12.5284/src/Mod/Fem/App/HypothesisPy.cpp 2012-05-24 20:20:50.307192529 -0700
@@ -85,15 +85,15 @@
SMESH_HypothesisPy<T>::behaviors().supportSetattr();
SMESH_HypothesisPy<T>::behaviors().type_object()->tp_new = &PyMake;
- add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
- add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
- add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
- add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
- add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
- add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
- add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
- add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
- add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
+ SMESH_HypothesisPy::add_varargs_method("setLibName", &SMESH_HypothesisPy<T>::setLibName, "setLibName(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLibName", &SMESH_HypothesisPy<T>::getLibName, "String getLibName()");
+ SMESH_HypothesisPy::add_varargs_method("setParameters", &SMESH_HypothesisPy<T>::setParameters, "setParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getParameters", &SMESH_HypothesisPy<T>::getParameters, "String getParameters()");
+ SMESH_HypothesisPy::add_varargs_method("setLastParameters", &SMESH_HypothesisPy<T>::setLastParameters, "setLastParameters(String)");
+ SMESH_HypothesisPy::add_varargs_method("getLastParameters", &SMESH_HypothesisPy<T>::getLastParameters, "String getLastParameters()");
+ SMESH_HypothesisPy::add_varargs_method("clearParameters", &SMESH_HypothesisPy<T>::clearParameters, "clearParameters()");
+ SMESH_HypothesisPy::add_varargs_method("isAuxiliary", &SMESH_HypothesisPy<T>::isAuxiliary, "Bool isAuxiliary()");
+ SMESH_HypothesisPy::add_varargs_method("setParametersByMesh", &SMESH_HypothesisPy<T>::setParametersByMesh, "setParametersByMesh(Mesh,Shape)");
Base::Interpreter().addType(SMESH_HypothesisPy<T>::behaviors().type_object(),
module,SMESH_HypothesisPy<T>::behaviors().getName());
}
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl 2012-05-24 20:20:50.307192529 -0700
@@ -55,7 +55,7 @@
Real fLen1 = Math<Real>::Sqrt(fX1*fX1 + fY1*fY1);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1;
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
if (Math<Real>::FAbs(fDet2) >= fScaledUncertainty)
{
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
@@ -93,7 +93,7 @@
Real fLen2 = Math<Real>::Sqrt(fD2x*fD2x + fD2y*fD2y + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2.inl 2012-05-24 20:20:50.307192529 -0700
@@ -65,7 +65,7 @@
Real fX1 = rkV1[0] - rkV0[0];
Real fY1 = rkV1[1] - rkV0[1];
- Real fDet2 = Det2(fX0,fY0,fX1,fY1);
+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1);
return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -129,7 +129,7 @@
Real fZ0 = fS0x*fD0x + fS0y*fD0y;
Real fZ1 = fS1x*fD1x + fS1y*fD1y;
Real fZ2 = fS2x*fD2x + fS2y*fD2y;
- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2);
return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 19:42:01.194614269 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Int64.inl 2012-05-24 20:20:50.307192529 -0700
@@ -42,7 +42,7 @@
Integer64 iX1 = (Integer64)rkV1[0] - (Integer64)rkV0[0];
Integer64 iY1 = (Integer64)rkV1[1] - (Integer64)rkV0[1];
- Integer64 iDet2 = Det2(iX0,iY0,iX1,iY1);
+ Integer64 iDet2 = this->Det2(iX0,iY0,iX1,iY1);
return (iDet2 > 0 ? +1 : (iDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -74,7 +74,7 @@
Integer64 iZ0 = iS0x*iD0x + iS0y*iD0y;
Integer64 iZ1 = iS1x*iD1x + iS1y*iD1y;
Integer64 iZ2 = iS2x*iD2x + iS2y*iD2y;
- Integer64 iDet3 = Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
+ Integer64 iDet3 = this->Det3(iD0x,iD0y,iZ0,iD1x,iD1y,iZ1,iD2x,iD2y,iZ2);
return (iDet3 < 0 ? 1 : (iDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 19:42:01.191614365 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TInteger.inl 2012-05-24 20:20:50.307192529 -0700
@@ -43,7 +43,7 @@
TInteger<2> kX1((int)rkV1[0] - (int)rkV0[0]);
TInteger<2> kY1((int)rkV1[1] - (int)rkV0[1]);
- TInteger<2> kDet2 = Det2(kX0,kY0,kX1,kY1);
+ TInteger<2> kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -75,7 +75,7 @@
TInteger<4> kZ0 = kS0x*kD0x + kS0y*kD0y;
TInteger<4> kZ1 = kS1x*kD1x + kS1y*kD1y;
TInteger<4> kZ2 = kS2x*kD2x + kS2y*kD2y;
- TInteger<4> kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ TInteger<4> kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2TRational.inl 2012-05-24 20:20:50.307192529 -0700
@@ -127,7 +127,7 @@
Rational kX1 = m_akRVertex[iV1][0] - m_akRVertex[iV0][0];
Rational kY1 = m_akRVertex[iV1][1] - m_akRVertex[iV0][1];
- Rational kDet2 = Det2(kX0,kY0,kX1,kY1);
+ Rational kDet2 = this->Det2(kX0,kY0,kX1,kY1);
return (kDet2 > 0 ? +1 : (kDet2 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -179,7 +179,7 @@
Rational kZ0 = kS0x*kD0x + kS0y*kD0y;
Rational kZ1 = kS1x*kD1x + kS1y*kD1y;
Rational kZ2 = kS2x*kD2x + kS2y*kD2y;
- Rational kDet3 = Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
+ Rational kDet3 = this->Det3(kD0x,kD0y,kZ0,kD1x,kD1y,kZ1,kD2x,kD2y,kZ2);
return (kDet3 < 0 ? 1 : (kDet3 > 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 19:42:01.190614397 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl 2012-05-24 20:21:28.563013748 -0700
@@ -62,7 +62,7 @@
Real fLen2 = Math<Real>::Sqrt(fX2*fX2 + fY2*fY2 + fZ2*fZ2);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2;
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
if (Math<Real>::FAbs(fDet3) >= fScaledUncertainty)
{
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
@@ -115,7 +115,7 @@
Real fLen3 = Math<Real>::Sqrt(fD3x*fD3x+fD3y*fD3y+fD3z*fD3z+fW3*fW3);
Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2*fLen3;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
if (Math<Real>::FAbs(fDet4) >= fScaledUncertainty)
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 19:42:01.193614301 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3.inl 2012-05-24 20:21:32.913879668 -0700
@@ -72,7 +72,7 @@
Real fY2 = rkV2[1] - rkV0[1];
Real fZ2 = rkV2[2] - rkV0[2];
- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2);
return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -158,7 +158,7 @@
Real fW1 = fS1x*fD1x + fS1y*fD1y + fS1z*fD1z;
Real fW2 = fS2x*fD2x + fS2y*fD2y + fS2z*fD2z;
Real fW3 = fS3x*fD3x + fS3y*fD3y + fS3z*fD3z;
- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x,
fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3);
return (fDet4 > (Real)0.0 ? 1 : (fDet4 < (Real)0.0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Int64.inl 2012-05-24 20:21:36.845758502 -0700
@@ -48,7 +48,7 @@
Integer64 iY2 = (Integer64)rkV2[1] - (Integer64)rkV0[1];
Integer64 iZ2 = (Integer64)rkV2[2] - (Integer64)rkV0[2];
- Integer64 iDet3 = Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
+ Integer64 iDet3 = this->Det3(iX0,iY0,iZ0,iX1,iY1,iZ1,iX2,iY2,iZ2);
return (iDet3 > 0 ? +1 : (iDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -100,7 +100,7 @@
Integer64 iW1 = iS1x*iD1x + iS1y*iD1y + iS1z*iD1z;
Integer64 iW2 = iS2x*iD2x + iS2y*iD2y + iS2z*iD2z;
Integer64 iW3 = iS3x*iD3x + iS3y*iD3y + iS3z*iD3z;
- Integer64 iDet4 = Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
+ Integer64 iDet4 = this->Det4(iD0x,iD0y,iD0z,iW0,iD1x,iD1y,iD1z,iW1,iD2x,
iD2y,iD2z,iW2,iD3x,iD3y,iD3z,iW3);
return (iDet4 > 0 ? 1 : (iDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 19:42:01.192614333 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TInteger.inl 2012-05-24 20:21:48.905386855 -0700
@@ -49,7 +49,7 @@
TInteger<4> kY2((int)rkV2[1] - (int)rkV0[1]);
TInteger<4> kZ2((int)rkV2[2] - (int)rkV0[2]);
- TInteger<4> kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ TInteger<4> kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -96,7 +96,7 @@
TInteger<6> kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
TInteger<6> kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
TInteger<6> kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- TInteger<6> kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
+ TInteger<6> kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,kD2y,
kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl
--- FreeCAD-0.12.5284.orig/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 19:42:01.189614429 -0700
+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3TRational.inl 2012-05-24 20:21:41.135626300 -0700
@@ -136,7 +136,7 @@
Rational kY2 = m_akRVertex[iV2][1] - m_akRVertex[iV0][1];
Rational kZ2 = m_akRVertex[iV2][2] - m_akRVertex[iV0][2];
- Rational kDet3 = Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
+ Rational kDet3 = this->Det3(kX0,kY0,kZ0,kX1,kY1,kZ1,kX2,kY2,kZ2);
return (kDet3 > 0 ? +1 : (kDet3 < 0 ? -1 : 0));
}
//----------------------------------------------------------------------------
@@ -208,7 +208,7 @@
Rational kW1 = kS1x*kD1x + kS1y*kD1y + kS1z*kD1z;
Rational kW2 = kS2x*kD2x + kS2y*kD2y + kS2z*kD2z;
Rational kW3 = kS3x*kD3x + kS3y*kD3y + kS3z*kD3z;
- Rational kDet4 = Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
+ Rational kDet4 = this->Det4(kD0x,kD0y,kD0z,kW0,kD1x,kD1y,kD1z,kW1,kD2x,
kD2y,kD2z,kW2,kD3x,kD3y,kD3z,kW3);
return (kDet4 > 0 ? 1 : (kDet4 < 0 ? -1 : 0));
freecad-glu.patch:
GLImageBox.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE freecad-glu.patch ---
diff -Naur freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp
--- freecad-0.12.orig/src/Mod/Image/Gui/GLImageBox.cpp 2010-02-18 05:03:53.000000000 -0600
+++ freecad-0.12/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-01 16:49:09.041859287 -0600
@@ -27,6 +27,7 @@
# include <GL/glext.h>
#endif
+#include <GL/glu.h>
#include "GLImageBox.h"
using namespace ImageGui;
freecad-system_inst.patch:
freecad-svn5184.mod/CMakeLists.txt | 15 +--
freecad-svn5184.mod/data/examples/CMakeLists.txt | 2
freecad-svn5184.mod/src/App/CMakeLists.txt | 8 +
freecad-svn5184.mod/src/Base/CMakeLists.txt | 3
freecad-svn5184.mod/src/Doc/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt | 8 -
freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt | 6 -
freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt | 10 --
freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt | 4
freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt | 5 -
freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt | 47 +++++-----
freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt | 12 +-
freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt | 21 ++--
freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt | 3
freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt | 2
freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt | 3
freecad-svn5220/src/App/CMakeLists.txt | 3
freecad-svn5220/src/Base/CMakeLists.txt | 4
freecad-svn5220/src/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Main/CMakeLists.txt | 7 +
freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt | 1
freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 3
67 files changed, 171 insertions(+), 119 deletions(-)
--- NEW FILE freecad-system_inst.patch ---
diff -Naur freecad-svn5184.orig/CMakeLists.txt freecad-svn5184.mod/CMakeLists.txt
--- freecad-svn5184.orig/CMakeLists.txt 2011-11-30 09:36:58.969275770 -0600
+++ freecad-svn5184.mod/CMakeLists.txt 2011-11-30 16:07:00.353807219 -0600
@@ -61,11 +61,12 @@
if(WIN32)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
else(WIN32)
-# SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
+ SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad")
+ SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif(WIN32)
-# ================================================================================
-# == Win32 is default behaviour use the LibPack copied in Source tree ============
+# ==============================================================================
+# == Win32 is default behaviour use the LibPack copied in Source tree ==========
if(MSVC)
OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON)
set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack")
@@ -74,7 +75,7 @@
set(FREECAD_LIBPACK_DIR "" CACHE PATH "Directory of the FreeCAD LibPack")
endif(MSVC)
-# ================================================================================
+# ==============================================================================
# == All the options for the build process ============
OPTION(FREECAD_BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
@@ -82,10 +83,10 @@
OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
+SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
+SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
-
-
-# ================================================================================
+# ==============================================================================
if(FREECAD_LIBPACK_USE)
# checking for a unique file in LibPack location to make sure the right version of the LibPack is there
diff -Naur freecad-svn5184.orig/data/examples/CMakeLists.txt freecad-svn5184.mod/data/examples/CMakeLists.txt
--- freecad-svn5184.orig/data/examples/CMakeLists.txt 2011-05-24 14:02:32.000000000 -0500
+++ freecad-svn5184.mod/data/examples/CMakeLists.txt 2011-11-30 11:56:01.050240955 -0600
@@ -12,7 +12,7 @@
fc_copy_sources("data/examples" "Examples" ${Examples_Files})
-install(
+INSTALL(
FILES
${Examples_Files}
DESTINATION
diff -Naur freecad-svn5184.orig/src/App/CMakeLists.txt freecad-svn5184.mod/src/App/CMakeLists.txt
--- freecad-svn5184.orig/src/App/CMakeLists.txt 2011-06-14 09:11:52.000000000 -0500
+++ freecad-svn5184.mod/src/App/CMakeLists.txt 2011-11-30 16:08:36.464683016 -0600
@@ -3,6 +3,14 @@
add_definitions(-DBOOST_DYN_LINK)
endif(WIN32)
+IF(RESOURCEDIR)
+ add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
+ENDIF(RESOURCEDIR)
+
+IF(DOCDIR)
+ add_definitions(-DDOCDIR="${DOCDIR}")
+ENDIF(DOCDIR)
+
include_directories(
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
diff -Naur freecad-svn5184.orig/src/Base/CMakeLists.txt freecad-svn5184.mod/src/Base/CMakeLists.txt
--- freecad-svn5184.orig/src/Base/CMakeLists.txt 2011-01-26 05:56:38.000000000 -0600
+++ freecad-svn5184.mod/src/Base/CMakeLists.txt 2011-11-30 10:45:20.128198748 -0600
@@ -309,6 +309,9 @@
LIBRARY DESTINATION lib
)
else(WIN32)
+ set_target_properties(FreeCADBase
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5184.orig/src/Doc/CMakeLists.txt freecad-svn5184.mod/src/Doc/CMakeLists.txt
--- freecad-svn5184.orig/src/Doc/CMakeLists.txt 2011-01-28 08:38:53.000000000 -0600
+++ freecad-svn5184.mod/src/Doc/CMakeLists.txt 2011-11-30 10:38:04.225248987 -0600
@@ -1,5 +1,5 @@
find_package(Doxygen)
-if( DOXYGEN_FOUND)
+if(DOXYGEN_FOUND)
IF (DOXYGEN_DOT_EXECUTABLE)
SET(HAVE_DOT YES)
diff -Naur freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Arch/CMakeLists.txt 2011-10-14 11:48:44.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Arch/CMakeLists.txt 2011-11-30 11:57:29.541317665 -0600
@@ -30,9 +30,7 @@
fc_copy_sources("Mod/Arch" "Arch" ${all_files})
-install(
- FILES
- ${Arch_SRCS}
- DESTINATION
- Mod/Arch
+INSTALL(
+ FILES ${Arch_SRCS}
+ DESTINATION Mod/Arch
)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/App/CMakeLists.txt 2011-11-30 11:00:47.662045120 -0600
@@ -38,6 +38,7 @@
else(MSVC)
set_target_properties(Complete PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(Complete PROPERTIES PREFIX "")
+ set_target_properties(Complete PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Complete DESTINATION lib)
+INSTALL(TARGETS Complete DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Complete/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Complete/CMakeLists.txt 2011-11-30 10:57:26.092627644 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Draft/CMakeLists.txt 2011-02-02 09:56:18.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Draft/CMakeLists.txt 2011-11-30 11:03:20.932041683 -0600
@@ -34,14 +34,14 @@
fc_copy_sources("Mod/Draft" "Draft" ${all_files})
-install(
+
+INSTALL(
FILES
${DraftLibs_SRCS}
DESTINATION
Mod/Draft/draftlibs
)
-
-install(
+INSTALL(
FILES
${Draft_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Drawing/App/CMakeLists.txt 2011-11-30 12:03:31.686356774 -0600
@@ -85,6 +85,7 @@
else(MSVC)
set_target_properties(Drawing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(Drawing PROPERTIES PREFIX "")
+ set_target_properties(Drawing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Drawing DESTINATION lib)
+INSTALL(TARGETS Drawing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/CMakeLists.txt 2011-11-30 11:03:56.361884884 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Drawing/Gui/CMakeLists.txt 2011-06-15 09:24:33.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Drawing/Gui/CMakeLists.txt 2011-11-30 11:05:11.758423159 -0600
@@ -83,6 +83,7 @@
else(MSVC)
set_target_properties(DrawingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
set_target_properties(DrawingGui PROPERTIES PREFIX "")
+ set_target_properties(DrawingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS DrawingGui DESTINATION lib)
+INSTALL(TARGETS DrawingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/App/CMakeLists.txt 2011-03-31 10:38:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/App/CMakeLists.txt 2011-11-30 11:24:22.670819700 -0600
@@ -79,6 +79,7 @@
else(MSVC)
set_target_properties(Fem PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(Fem PROPERTIES PREFIX "")
+ set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Fem DESTINATION lib)
+INSTALL(TARGETS Fem DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/CMakeLists.txt 2010-11-23 07:25:34.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Fem/CMakeLists.txt 2011-11-30 11:23:00.206515462 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Fem/Gui/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Fem/Gui/CMakeLists.txt 2011-11-30 11:23:44.905054292 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(FemGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
set_target_properties(FemGui PROPERTIES PREFIX "")
+ set_target_properties(FemGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS FemGui DESTINATION lib)
+INSTALL(TARGETS FemGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Idf/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Idf/CMakeLists.txt 2011-11-30 11:25:49.758972604 -0600
@@ -48,23 +48,21 @@
fc_copy_sources("Mod/Idf" "Idf" ${all_files})
-install(
+INSTALL(
FILES
${IdfLibs_SRCS}
DESTINATION
Mod/Idf/Idflibs
)
-
-install(
+INSTALL(
FILES
${IdfLang_SRCS}
DESTINATION
Mod/Idf/Languages
)
-
-install(
+INSTALL(
FILES
${Idf_SRCS}
DESTINATION
Mod/Idf
- )
+)
diff -Naur freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/App/CMakeLists.txt 2011-01-25 09:40:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/App/CMakeLists.txt 2011-11-30 11:27:17.458105233 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(Image PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(Image PROPERTIES PREFIX "")
+ set_target_properties(Image PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Image DESTINATION lib)
+INSTALL(TARGETS Image DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Image/CMakeLists.txt 2011-11-30 11:26:36.060458740 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Image/Gui/CMakeLists.txt 2011-01-24 12:06:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Image/Gui/CMakeLists.txt 2011-11-30 11:27:58.559761333 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(ImageGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
set_target_properties(ImageGui PROPERTIES PREFIX "")
+ set_target_properties(ImageGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImageGui DESTINATION lib)
+INSTALL(TARGETS ImageGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/CMakeLists.txt 2011-01-04 06:35:19.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/CMakeLists.txt 2011-11-30 11:28:45.368230781 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
DESTINATION
Mod/Import
-)
+)
diff -Naur freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Import/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Import/Gui/CMakeLists.txt 2011-11-30 11:29:14.799268344 -0600
@@ -56,6 +56,7 @@
else(MSVC)
set_target_properties(ImportGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
set_target_properties(ImportGui PROPERTIES PREFIX "")
+ set_target_properties(ImportGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ImportGui DESTINATION lib)
+INSTALL(TARGETS ImportGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/App/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/App/CMakeLists.txt 2011-11-30 11:30:36.267604260 -0600
@@ -50,6 +50,7 @@
else(MSVC)
set_target_properties(Inspection PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
set_target_properties(Inspection PROPERTIES PREFIX "")
+ set_target_properties(Inspection PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-
-install(TARGETS Inspection DESTINATION lib)
+
+INSTALL(TARGETS Inspection DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/CMakeLists.txt 2011-01-26 03:20:55.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/CMakeLists.txt 2011-11-30 11:29:53.774993917 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Inspection/Gui/CMakeLists.txt 2011-02-02 06:29:29.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Inspection/Gui/CMakeLists.txt 2011-11-30 11:31:46.555305748 -0600
@@ -47,26 +47,27 @@
ViewProviderInspection.cpp
ViewProviderInspection.h
Workbench.cpp
- Workbench.h
-)
-
-add_library(InspectionGui SHARED ${InspectionGui_SRCS})
-target_link_libraries(InspectionGui ${InspectionGui_LIBS})
-fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
-
-if(MSVC)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "../")
-elseif(MINGW)
- set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
- set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
- set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-else(MSVC)
- set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
- set_target_properties(InspectionGui PROPERTIES PREFIX "")
-endif(MSVC)
-
-install(TARGETS InspectionGui DESTINATION lib)
+ Workbench.h
+)
+
+add_library(InspectionGui SHARED ${InspectionGui_SRCS})
+target_link_libraries(InspectionGui ${InspectionGui_LIBS})
+fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
+
+if(MSVC)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "../")
+elseif(MINGW)
+ set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+ set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
+ set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+else(MSVC)
+ set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
+ set_target_properties(InspectionGui PROPERTIES PREFIX "")
+ set_target_properties(InspectionGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+endif(MSVC)
+
+INSTALL(TARGETS InspectionGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/App/CMakeLists.txt 2011-05-20 09:39:48.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/App/CMakeLists.txt 2011-11-30 11:33:47.854316080 -0600
@@ -347,6 +347,7 @@
else(MSVC)
set_target_properties(Mesh PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(Mesh PROPERTIES PREFIX "")
+ set_target_properties(Mesh PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Mesh DESTINATION lib)
+INSTALL(TARGETS Mesh DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/CMakeLists.txt 2011-11-30 11:33:19.819243657 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Mesh/Gui/CMakeLists.txt 2010-11-05 09:59:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Mesh/Gui/CMakeLists.txt 2011-11-30 11:34:26.387041214 -0600
@@ -124,6 +124,7 @@
else(MSVC)
set_target_properties(MeshGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
set_target_properties(MeshGui PROPERTIES PREFIX "")
+ set_target_properties(MeshGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshGui DESTINATION lib)
+INSTALL(TARGETS MeshGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/App/CMakeLists.txt 2010-10-24 05:36:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/App/CMakeLists.txt 2011-11-30 11:35:26.526051628 -0600
@@ -66,6 +66,7 @@
else(MSVC)
set_target_properties(MeshPart PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPart PROPERTIES PREFIX "")
+ set_target_properties(MeshPart PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPart DESTINATION lib)
+INSTALL(TARGETS MeshPart DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/CMakeLists.txt 2011-11-30 11:34:57.482012457 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/MeshPart/Gui/CMakeLists.txt 2010-10-02 18:53:11.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/MeshPart/Gui/CMakeLists.txt 2011-11-30 11:35:53.700152675 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(MeshPartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
set_target_properties(MeshPartGui PROPERTIES PREFIX "")
+ set_target_properties(MeshPartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS MeshPartGui DESTINATION lib)
+INSTALL(TARGETS MeshPartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/App/CMakeLists.txt 2011-11-17 04:31:04.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/Part/App/CMakeLists.txt 2011-11-30 11:36:57.685036101 -0600
@@ -252,6 +252,7 @@
else(MSVC)
set_target_properties(Part PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(Part PROPERTIES PREFIX "")
+ set_target_properties(Part PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Part DESTINATION lib)
+INSTALL(TARGETS Part DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/CMakeLists.txt 2011-11-30 11:36:19.927285066 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Part/Gui/CMakeLists.txt 2011-10-15 08:31:58.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Part/Gui/CMakeLists.txt 2011-11-30 11:37:36.752743837 -0600
@@ -178,6 +178,7 @@
else(MSVC)
set_target_properties(PartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
set_target_properties(PartGui PROPERTIES PREFIX "")
+ set_target_properties(PartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartGui DESTINATION lib)
+INSTALL(TARGETS PartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-22 04:37:02.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/App/CMakeLists.txt 2011-11-30 11:38:57.340078457 -0600
@@ -105,6 +105,7 @@
else(MSVC)
set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesign PROPERTIES PREFIX "")
+ set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesign DESTINATION lib)
+INSTALL(TARGETS PartDesign DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/PartDesign/CMakeLists.txt 2011-11-30 11:38:26.413101317 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-17 03:29:05.000000000 -0600
+++ freecad-svn5184.mod/src/Mod/PartDesign/Gui/CMakeLists.txt 2011-11-30 11:39:37.893737252 -0600
@@ -134,6 +134,7 @@
else(MSVC)
set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesignGui PROPERTIES PREFIX "")
+ set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PartDesignGui DESTINATION lib)
+INSTALL(TARGETS PartDesignGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/App/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/App/CMakeLists.txt 2011-11-30 11:41:17.777434173 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(Points PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(Points PROPERTIES PREFIX "")
+ set_target_properties(Points PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Points DESTINATION lib)
+INSTALL(TARGETS Points DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/CMakeLists.txt 2011-11-30 11:40:18.488394768 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Points/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Points/Gui/CMakeLists.txt 2011-11-30 11:42:01.941973792 -0600
@@ -69,6 +69,7 @@
else(MSVC)
set_target_properties(PointsGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
set_target_properties(PointsGui PROPERTIES PREFIX "")
+ set_target_properties(PointsGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS PointsGui DESTINATION lib)
+INSTALL(TARGETS PointsGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/App/CMakeLists.txt 2011-11-30 11:42:57.676130964 -0600
@@ -74,6 +74,7 @@
else(MSVC)
set_target_properties(Raytracing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(Raytracing PROPERTIES PREFIX "")
+ set_target_properties(Raytracing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Raytracing DESTINATION lib)
+INSTALL(TARGETS Raytracing DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/CMakeLists.txt 2011-11-30 11:42:29.349067575 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Raytracing/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Raytracing/Gui/CMakeLists.txt 2011-11-30 11:43:26.181188497 -0600
@@ -89,6 +89,7 @@
else(MSVC)
set_target_properties(RaytracingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
set_target_properties(RaytracingGui PROPERTIES PREFIX "")
+ set_target_properties(RaytracingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RaytracingGui DESTINATION lib)
+INSTALL(TARGETS RaytracingGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/App/CMakeLists.txt 2011-11-30 11:44:24.234269226 -0600
@@ -47,6 +47,7 @@
else(MSVC)
set_target_properties(ReverseEngineering PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineering PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineering PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS ReverseEngineering DESTINATION lib)
+INSTALL(TARGETS ReverseEngineering DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/ReverseEngineering/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/ReverseEngineering/CMakeLists.txt 2011-11-30 11:43:50.583381744 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/App/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/App/CMakeLists.txt 2011-11-30 11:45:31.977029697 -0600
@@ -137,6 +137,7 @@
else(MSVC)
set_target_properties(Robot PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(Robot PROPERTIES PREFIX "")
+ set_target_properties(Robot PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Robot DESTINATION lib)
+INSTALL(TARGETS Robot DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/CMakeLists.txt 2011-11-30 11:45:04.496938137 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Robot/Gui/CMakeLists.txt 2011-07-26 08:37:24.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Robot/Gui/CMakeLists.txt 2011-11-30 11:46:01.680047793 -0600
@@ -162,6 +162,7 @@
else(MSVC)
set_target_properties(RobotGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
set_target_properties(RobotGui PROPERTIES PREFIX "")
+ set_target_properties(RobotGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS RobotGui DESTINATION lib)
+INSTALL(TARGETS RobotGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/App/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/App/CMakeLists.txt 2011-11-30 11:47:17.199551470 -0600
@@ -46,6 +46,7 @@
else(MSVC)
set_target_properties(Sandbox PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(Sandbox PROPERTIES PREFIX "")
+ set_target_properties(Sandbox PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sandbox DESTINATION lib)
+INSTALL(TARGETS Sandbox DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/CMakeLists.txt 2010-08-24 06:42:52.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/CMakeLists.txt 2011-11-30 11:46:39.023813388 -0600
@@ -4,10 +4,10 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
- FILES
- Init.py
- InitGui.py
- DESTINATION
- Mod/Sandbox
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ DESTINATION
+ Mod/Sandbox
)
diff -Naur freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-07-08 08:07:49.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sandbox/Gui/CMakeLists.txt 2011-11-30 11:47:59.296160060 -0600
@@ -57,6 +57,7 @@
else(MSVC)
set_target_properties(SandboxGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
set_target_properties(SandboxGui PROPERTIES PREFIX "")
+ set_target_properties(SandboxGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SandboxGui DESTINATION lib)
+INSTALL(TARGETS SandboxGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/App/CMakeLists.txt 2011-09-07 09:40:01.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/App/CMakeLists.txt 2011-11-30 11:48:49.511500367 -0600
@@ -121,6 +121,7 @@
else(MSVC)
set_target_properties(Sketcher PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(Sketcher PROPERTIES PREFIX "")
+ set_target_properties(Sketcher PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Sketcher DESTINATION lib)
+INSTALL(TARGETS Sketcher DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/CMakeLists.txt 2011-11-30 11:48:21.240434767 -0600
@@ -4,7 +4,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-10-03 17:57:56.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Sketcher/Gui/CMakeLists.txt 2011-11-30 11:49:16.609604780 -0600
@@ -113,6 +113,7 @@
else(MSVC)
set_target_properties(SketcherGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
set_target_properties(SketcherGui PROPERTIES PREFIX "")
+ set_target_properties(SketcherGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS SketcherGui DESTINATION lib)
+INSTALL(TARGETS SketcherGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/App/CMakeLists.txt 2011-05-16 11:06:57.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/App/CMakeLists.txt 2011-11-30 11:50:12.614753899 -0600
@@ -37,6 +37,7 @@
else(MSVC)
set_target_properties(Start PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(Start PROPERTIES PREFIX "")
+ set_target_properties(Start PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS Start DESTINATION lib)
+INSTALL(TARGETS Start DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/CMakeLists.txt 2011-11-30 19:08:17.276035136 -0600
@@ -2,9 +2,10 @@
add_subdirectory(App)
if(FREECAD_BUILD_GUI)
add_subdirectory(Gui)
+ add_subdirectory(StartPage)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Start/Gui/CMakeLists.txt 2011-09-13 09:34:13.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Start/Gui/CMakeLists.txt 2011-11-30 11:50:41.919785412 -0600
@@ -70,6 +70,7 @@
else(MSVC)
set_target_properties(StartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
set_target_properties(StartGui PROPERTIES PREFIX "")
+ set_target_properties(StartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS StartGui DESTINATION lib)
+INSTALL(TARGETS StartGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/TemplatePyMod/CMakeLists.txt 2011-08-08 14:17:10.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/TemplatePyMod/CMakeLists.txt 2011-11-30 11:51:17.723602252 -0600
@@ -9,13 +9,14 @@
DocumentObject.py
)
-install(
- FILES
- Init.py
- InitGui.py
- Commands.py
- FeaturePython.py
- PythonQt.py
- Tests.py
- DESTINATION
- Mod/TemplatePyMod)
+INSTALL(
+ FILES
+ Init.py
+ InitGui.py
+ Commands.py
+ FeaturePython.py
+ PythonQt.py
+ Tests.py
+ DESTINATION
+ Mod/TemplatePyMod
+)
diff -Naur freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/CMakeLists.txt 2011-07-13 05:10:30.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/CMakeLists.txt 2011-11-30 11:51:58.554253017 -0600
@@ -20,7 +20,7 @@
fc_copy_sources("Mod/Test" "Test" ${Test_SRCS})
-install(
+INSTALL(
FILES
${Test_SRCS}
DESTINATION
diff -Naur freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Test/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Test/Gui/CMakeLists.txt 2011-11-30 11:52:37.617962226 -0600
@@ -65,6 +65,7 @@
else(MSVC)
set_target_properties(QtUnitGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
set_target_properties(QtUnitGui PROPERTIES PREFIX "")
+ set_target_properties(QtUnitGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS QtUnitGui DESTINATION lib)
+INSTALL(TARGETS QtUnitGui DESTINATION lib)
diff -Naur freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/CMakeLists.txt 2011-11-30 11:53:02.772131074 -0600
@@ -3,7 +3,7 @@
add_subdirectory(Gui)
endif(FREECAD_BUILD_GUI)
-install(
+INSTALL(
FILES
Init.py
InitGui.py
diff -Naur freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt
--- freecad-svn5184.orig/src/Mod/Web/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5184.mod/src/Mod/Web/Gui/CMakeLists.txt 2011-11-30 11:54:00.295230454 -0600
@@ -52,6 +52,7 @@
else(MSVC)
set_target_properties(WebGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
set_target_properties(WebGui PROPERTIES PREFIX "")
+ set_target_properties(WebGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
-install(TARGETS WebGui DESTINATION lib)
+INSTALL(TARGETS WebGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/Complete/Gui/CMakeLists.txt 2010-09-10 17:47:15.000000000 -0500
+++ freecad-svn5220/src/Mod/Complete/Gui/CMakeLists.txt 2011-12-05 10:20:10.830553148 -0600
@@ -44,6 +44,7 @@
else(MSVC)
set_target_properties(CompleteGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
set_target_properties(CompleteGui PROPERTIES PREFIX "")
+ set_target_properties(CompleteGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
install(TARGETS CompleteGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2010-09-11 04:58:50.000000000 -0500
+++ freecad-svn5220/src/Mod/ReverseEngineering/Gui/CMakeLists.txt 2011-12-05 10:50:21.815925156 -0600
@@ -54,6 +54,9 @@
else(MSVC)
set_target_properties(ReverseEngineeringGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "")
+ set_target_properties(ReverseEngineeringGui
+ PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
+ )
endif(MSVC)
install(TARGETS ReverseEngineeringGui DESTINATION lib)
diff -Naur freecad-svn5220.orig/src/App/CMakeLists.txt freecad-svn5220/src/App/CMakeLists.txt
--- freecad-svn5220.orig/src/App/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/App/CMakeLists.txt 2011-12-05 13:35:16.637348028 -0600
@@ -184,6 +184,7 @@
set_target_properties(FreeCADApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADApp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADApp PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -192,7 +193,7 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- INSTALL(TARGETS FreeCADApp
+ INSTALL(TARGETS FreeCADApp
LIBRARY DESTINATION lib
)
endif(WIN32)
diff -Naur freecad-svn5220.orig/src/Base/CMakeLists.txt freecad-svn5220/src/Base/CMakeLists.txt
--- freecad-svn5220.orig/src/Base/CMakeLists.txt 2011-12-05 13:43:58.164206727 -0600
+++ freecad-svn5220/src/Base/CMakeLists.txt 2011-12-05 13:37:27.551041426 -0600
@@ -301,6 +301,7 @@
set_target_properties(FreeCADBase PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADBase PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADBase PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -309,9 +310,6 @@
LIBRARY DESTINATION lib
)
else(WIN32)
- set_target_properties(FreeCADBase
- PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
- )
INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib
)
diff -Naur freecad-svn5220.orig/src/Gui/CMakeLists.txt freecad-svn5220/src/Gui/CMakeLists.txt
--- freecad-svn5220.orig/src/Gui/CMakeLists.txt 2011-07-25 09:59:26.000000000 -0500
+++ freecad-svn5220/src/Gui/CMakeLists.txt 2011-12-05 13:35:57.316009531 -0600
@@ -830,6 +830,7 @@
set_target_properties(FreeCADGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
else(MSVC)
set_target_properties(FreeCADGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
diff -Naur freecad-svn5220.orig/src/Main/CMakeLists.txt freecad-svn5220/src/Main/CMakeLists.txt
--- freecad-svn5220.orig/src/Main/CMakeLists.txt 2011-08-07 06:09:01.000000000 -0500
+++ freecad-svn5220/src/Main/CMakeLists.txt 2011-12-05 13:42:07.577838112 -0600
@@ -59,6 +59,7 @@
else(MSVC)
set_target_properties(FreeCADMain PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMain PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMain PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -99,6 +100,7 @@
else(MSVC)
set_target_properties(FreeCADMainCmd PROPERTIES OUTPUT_NAME "FreeCADCmd")
set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADMainCmd PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -140,6 +142,7 @@
set_target_properties(FreeCADMainPy PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMainPy PROPERTIES PREFIX "")
set_target_properties(FreeCADMainPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADMainPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -178,10 +181,12 @@
set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
else(MSVC)
set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -194,4 +199,4 @@
LIBRARY DESTINATION lib
)
endif(WIN32)
-endif(FREECAD_BUILD_GUI)
\ No newline at end of file
+endif(FREECAD_BUILD_GUI)
--- NEW FILE freecad.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH FREECAD 1 "July 25, 2007" freecad "Linux User's Manual"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
freecad \- An extensible Open Source CAx program for Unix/X11
.SH SYNOPSIS
.B freecad
.RI [ options ] " files"
.br
.B freecadcmd
.RI [ options ] " files"
.SH DESCRIPTION
.B FreeCAD
is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features
some key concepts like macro recording, workbenches, ability to run as a
server and dynamically loadable application extensions and it is designed
to be platform independent.
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH USAGE
\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of the options supported by \fBfreecad\fR is included below.
.SS "Generic options"
.TP
\fB\-h, \-\-help\fR
Show summary of options.
.TP
\fB\-v, \-\-version\fR
Show version of program.
.TP
\fB\-c, \-\-console\fR
Start in console mode.
.TP
\fB\-\-response\-file\fR \fIarg\fR
Can be specified with '@name', too.
.SS "Configuration"
.TP
\fB\-l, \-\-write\-log\fR
Write a log file.
.TP
\fB\-t, \-\-run\-test\fR \fIarg\fR
Test level.
.TP
\fB\-M, \-\-module\-path\fR \fIarg\fR
Additional module path.
.TP
\fB\-P, \-\-python\-path\fR \fIarg\fR
Additional Python path.
.SH SEE ALSO
To get more information about \fBFreeCAD\fR, please visit \fIhttp://juergen\-riegel.net/FreeCAD/Docu/index.php/Main_Page\fR
.SH BUGS
To report a bug, please visit \fIhttp://free-cad.sf.net/\fR
.SH AUTHOR
This manual page was written by Werner Mayer.
--- NEW FILE freecad.desktop ---
[Desktop Entry]
Version=1.0
Name=FreeCAD
Name[de]=FreeCAD
Comment=Feature based Parametric Modeler
Comment[de]=Feature-basierter parametrischer Modellierer
GenericName=CAD Application
GenericName[de]=CAD-Anwendung
Exec=/usr/bin/FreeCAD %F
Path=/usr/@lib@/freecad
Terminal=false
Type=Application
Icon=freecad
Categories=Graphics;Science;Education;Engineering;
StartupNotify=true
GenericName[de_DE]=Feature-basierter parametrischer Modellierer
MimeType=application/x-extension-fcstd;
--- NEW FILE freecad.spec ---
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web
# This revision is 0.12 final.
%global svnrev 5284
# Use update cmake package on EL builds.
%if 0%{?el6}
%global cmake %cmake28
%endif
# Some configuration options for other environments
# rpmbuild --with=occ: Compile using OpenCASCADE instead of OCE
%global occ %{?_with_occ: 1} %{?!_with_occ: 0}
# rpmbuild --with=bundled_zipios: use bundled version of zipios++
%global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 0}
# rpmbuild --with=bundled_pycxx: use bundled version of pycxx
%global bundled_pycxx %{?_with_bundled_pycxx: 1} %{?!_with_bundled_pycxx: 0}
# rpmbuild --with=bundled_smesh: use bundled version of Salome's Mesh
%global bundled_smesh %{?_with_bundled_smesh: 1} %{?!_with_bundled_smesh: 0}
Name: freecad
Version: 0.12
Release: 7%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
# This package must go in the non-free repository because of its dependence
# on OCE which is considered non-free.
License: GPLv3+ with exception
URL: http://sourceforge.net/apps/mediawiki/free-cad/
Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{svnrev}.ta...
Source101: freecad.desktop
Source102: freecad.1
# Patches 0 & 2 accepted upstream.
# https://sourceforge.net/apps/mantisbt/free-cad/view.php?id=519
# Fix a bunch of rpath issues and other tweaks.
Patch0: freecad-system_inst.patch
# Remove bundled libs from cmake configuration.
Patch1: freecad-3rdParty.patch
# Fix incomplete cmake config.
Patch2: freecad-StartPage.patch
# Fixed in svn
Patch3: freecad-glu.patch
# Disable unfinished modules.
Patch4: freecad-cmake_Mod_fix.patch
# Unbundle zipios++
Patch5: freecad-0.12-zipios.patch
# Patch for gcc 4.7
Patch6: freecad-gcc-4.7.patch
# Add build option for OpenCASCADE
Patch7: freecad-0.12-OpenCASCADE-option.patch
# Unbundle PyCXX
Patch8: freecad-0.12-pycxx.patch
# f2c is only needed for smesh, and maybe not even there
Patch9: freecad-0.12-rm_f2c.patch
# Utilities
BuildRequires: cmake doxygen swig
BuildRequires: gcc-gfortran
BuildRequires: gettext
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
# Development Libraries
BuildRequires: freeimage-devel
BuildRequires: libXmu-devel
BuildRequires: mesa-libGLU-devel
%if %{occ}
BuildRequires: OpenCASCADE-devel
%else
BuildRequires: OCE-devel
%endif
# Not yet in Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=665733
#BuildRequires: Coin3-devel
BuildRequires: Coin2-devel
BuildRequires: python2-devel
BuildRequires: boost-devel
BuildRequires: eigen3-devel
BuildRequires: qt-devel qt-webkit-devel
BuildRequires: SoQt-devel
# Not used yet.
#BuildRequires: ode-devel
BuildRequires: xerces-c xerces-c-devel
BuildRequires: libspnav-devel
#BuildRequires: opencv-devel
%if ! %{bundled_smesh}
BuildRequires: smesh-devel
%endif
%if ! %{bundled_zipios}
BuildRequires: zipios++-devel
%endif
%if ! %{bundled_pycxx}
BuildRequires: python-pycxx-devel
%endif
# Needed for plugin support and is not a soname dependency.
Requires: python-pivy
Requires: hicolor-icon-theme
# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
# prevent private capabilities being advertised in Provides/Requires
%define plugin_regexp /^\\\(libFreeCAD.*%(for i in %{plugins}; do echo -n "\\\|$i\\\|$iGui"; done)\\\)\\\(\\\|Gui\\\)\\.so/d
%{?filter_setup:
%filter_provides_in %{_libdir}/%{name}/lib
%filter_from_requires %{plugin_regexp}
%filter_from_provides %{plugin_regexp}
%filter_setup
}
%description
FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed
directly at mechanical engineering and product design but also fits a wider
range of uses in engineering, such as architecture or other engineering
specialties. It is a feature-based parametric modeler with a modular software
architecture which makes it easy to provide additional functionality without
modifying the core system.
%package doc
Summary: Extended documentation for FreeCAD
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: qt-assistant
%description doc
End user documentation for FreeCAD
%prep
%setup -q -n FreeCAD-%{version}.%{svnrev}
%patch0 -p1 -b .sysinst
%patch1 -p1 -b .3rdparty
%patch2 -p1 -b .startpage
%patch3 -p1 -b .glufix
%patch4 -p1 -b .modfix
%patch5 -p1 -b .zipios
%patch6 -p1 -b .gcc47
%patch7 -p1 -b .OCC
# Remove bundled pycxx if we're not using it
%if ! %{bundled_pycxx}
%patch8 -p1 -b .pycxx
rm -rf src/CXX
%endif
%patch9 -p1 -b .f2c
# Fix encodings
dos2unix -k src/Mod/Test/unittestgui.py \
ChangeLog.txt \
copying.lib \
data/License.txt
# Removed bundled libraries
rm -rf src/3rdParty
%build
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/freecad \
-DRESOURCEDIR=%{_libdir}/freecad \
-DDOCDIR=%{_docdir}/%{name} \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
-DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
%if %{occ}
-DUSE_OCC=TRUE \
%endif
%if ! %{bundled_smesh}
-DSMESH_INCLUDE_DIR=%{_includedir} \
%endif
%if ! %{bundled_zipios}
-DUSE_EXTERNAL_ZIPIOS=TRUE \
%endif
%if ! %{bundled_pycxx}
-DPYCXX_INCLUDE_DIR=$(pkg-config --variable=includedir PyCXX) \
-DPYCXX_SOURCE_DIR=$(pkg-config --variable=srcdir PyCXX) \
%endif
../
make %{?_smp_mflags}
%install
pushd build
make install DESTDIR=%{buildroot}
popd
# Symlink binaries to /usr/bin
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_bindir}
ln -s ../%{_lib}/freecad/bin/FreeCAD .
ln -s ../%{_lib}/freecad/bin/FreeCADCmd .
popd
# Fix problems with unittestgui.py
chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py
# Install desktop file
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE101}
sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop
# Install desktop icon
install -pD -m 0644 src/Gui/Icons/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# Install man page
install -pD -m 0644 %{SOURCE102} \
%{buildroot}%{_mandir}/man1/%{name}.1
# Symlink manpage to other binary names
pushd %{buildroot}%{_mandir}/man1
ln -sf %{name}.1.gz FreeCAD.1.gz
ln -sf %{name}.1.gz FreeCADCmd.1.gz
popd
# Install QT Assistant documentation
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 build/doc/freecad.* %{buildroot}%{_docdir}/%{name}/
# Bug maintainers to keep %%{plugins} macro up to date.
#
# Make sure there are no plugins that need to be added to plugins macro
new_plugins=`ls %{buildroot}%{_libdir}/freecad/lib | sed -e '%{plugin_regexp}'`
if [ -n "$new_plugins" ]; then
echo -e "\n\n\n**** ERROR:\n" \
"\nPlugins not caught by regexp: " $new_plugins \
"\n\nPlugins in %{_libdir}/freecad/lib do not exist in" \
"\nspecfile %%{plugins} macro. Please add these to" \
"\n%%{plugins} macro at top of specfile and rebuild.\n****\n" 1>&2
exit 1
fi
# Make sure there are no entries in the plugins macro that don't match plugins
for p in %{plugins}; do
if [ -z "`ls %{buildroot}%{_libdir}/freecad/lib/$p*.so`" ]; then
set +x
echo -e "\n\n\n**** ERROR:\n" \
"\nExtra entry in %%{plugins} macro with no matching plugin:" \
"'$p'.\n\nPlease remove from %%{plugins} macro at top of" \
"\nspecfile and rebuild.\n****\n" 1>&2
exit 1
fi
done
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/bin/
%{_libdir}/%{name}/data/
%{_libdir}/%{name}/lib/
%{_libdir}/%{name}/Mod/
%{_mandir}/man1/*.1.gz
%files doc
%{_docdir}/%{name}
%changelog
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %%doc.
- Add missing build requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-6
- Filter out automatically generated Provides/Requires of private libraries
- freecad.desktop not passing 'desktop-file-validate'; fixed
* Mon Jun 25 2012 <john(a)zultron.com> - 0.12-5
- New patch to unbundle PyCXX
- Add conditional build options for OpenCASCADE, bundled Zipios++,
bundled PyCXX, bundled smesh
* Tue Jun 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-4
- Add linker flag to stop excessive linking.
* Thu May 31 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-3
- Add patch for GCC 4.7 on Fedora 17.
* Thu Nov 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-2
- Initial release.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Jul 2012 21:00:42 -0000 1.1
+++ .cvsignore 7 Jul 2012 03:15:42 -0000 1.2
@@ -0,0 +1 @@
+freecad-0.12.5284.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Jul 2012 21:00:42 -0000 1.1
+++ sources 7 Jul 2012 03:15:42 -0000 1.2
@@ -0,0 +1 @@
+fcd91286c578a219491ffebb2111bddf freecad-0.12.5284.tar.gz
12 years, 4 months
- 1
- 0