Skip to content

Commit 68f0a87

Browse files
kyngchaoskyngchaos
committed
cleanup Qwt build for OS X
1 parent baedeb2 commit 68f0a87

File tree

3 files changed

+37
-155
lines changed

3 files changed

+37
-155
lines changed

‎INSTALL

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Quantum GIS (QGIS)
22
Building QGIS from source - step by step
3-
Saturday April 06, 2013
3+
Sunday April 07, 2013
44

55

6-
Last Updated: Saturday April 06, 2013
7-
Last Change : Saturday April 06, 2013
6+
Last Updated: Sunday April 07, 2013
7+
Last Change : Saturday December 08, 2012
88

99

1010
1. Introduction
@@ -103,7 +103,7 @@ Required build deps:
103103
- GEOS >= 3.0
104104
- Sqlite3 >= 3.0.0
105105
- GDAL/OGR >= 1.4.x
106-
- Qwt >= 5.0 & < 6.1
106+
- Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
107107
- expat >= 1.95
108108

109109
Optional dependencies:
@@ -1633,61 +1633,28 @@ The GPS tracking feature uses Qwt.
16331633

16341634
NOTE: PyQwt is not compatible with PyQt 4.9, so we will skip that.
16351635

1636-
Download the latest Qwt 5.x or 6.x source from:
1636+
Download the latest Qwt 6.0 source (6.1 does not work with the QwtPolar in QGIS) from:
16371637

16381638
http://sourceforge.net/projects/qwt
16391639

16401640
Double-click the tarball to unpack it. Now, cd to the qwt source folder in a
16411641
Terminal.
16421642

1643-
Type these commands to build and install 5.x.x (assumes v5.2.2, adjust commands
1643+
Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands
16441644
for other version as needed):
16451645

1646+
cat >> qwtconfig.pri <<EOF
1647+
QWT_CONFIG -= QwtFramework
1648+
EOF
16461649
qmake -spec macx-g++
16471650
make -j [#cpus]
16481651
sudo make install
16491652

1650-
sudo install_name_tool -id /usr/local/qwt-5.2.2/lib/libqwt.5.dylib \
1651-
/usr/local/qwt-5.2.2/lib/libqwt.5.dylib
1652-
1653-
The Qwt shared library is now installed in /usr/local/qwt-5.x.x (x.x is
1654-
the minor.point version). Remember this for QGIS configuration.
1655-
1656-
Qwt 6.x.x is similarly built, but defaults to being installed as a framework:
1657-
1658-
cd <Qwt 6.x.x source directory>
1659-
qmake -spec macx-g++
1660-
make -j [#cpus]
1661-
sudo make install
1653+
sudo install_name_tool -id /usr/local/qwt-6.0.2/lib/libqwt.6.dylib \
1654+
/usr/local/qwt-6.0.2/lib/libqwt.6.dylib
16621655

1663-
TODO: Remedy for :
1664-
1665-
shrub:qwt-6.1-rc3 timlinux$ sudo make install
1666-
Password:
1667-
cd src/ && make -f Makefile install
1668-
rm -f -r "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
1669-
cp -f -R "../lib/qwt.framework" "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
1670-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/html /usr/local/qwt-6.1.0-rc3/doc/
1671-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/man /usr/local/qwt-6.1.0-rc3/doc/
1672-
cd textengines/ && make -f Makefile install
1673-
make[1]: Nothing to be done for `install'.
1674-
cd designer/ && make -f Makefile install
1675-
rm -f libqwt_designer_plugin.dylib
1676-
linking plugins/designer/libqwt_designer_plugin.dylib
1677-
ld: library not found for -lqwt
1678-
collect2: ld returned 1 exit status
1679-
make[1]: *** [plugins/designer/libqwt_designer_plugin.dylib] Error 1
1680-
make: *** [sub-designer-install_subtargets-ordered] Error 2
1681-
1682-
sudo install_name_tool -id /usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt \
1683-
/usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt
1684-
1685-
This installs to the following location
1686-
1687-
/usr/local/qwt-6.x.x/lib/qwt.framework/qwt
1688-
/usr/local/qwt-6.x.x/lib/qwt.framework/Headers
1689-
1690-
(x.x is the minor.point version). Remember these for QGIS configuration.
1656+
The Qwt shared library is now installed in /usr/local/qwt-6.0.x (x is
1657+
the point version). Remember this for QGIS configuration.
16911658

16921659

16931660
5.4.10. Additional dependencies: Bison

‎doc/INSTALL.html

Lines changed: 15 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
66
<TITLE>Quantum GIS (QGIS)</TITLE>
77

8-
<!-- Included doc/style.css -->
8+
<!-- Included style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>Quantum GIS (QGIS)</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Saturday April 06, 2013</H3>
80+
<H3>Sunday April 07, 2013</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Saturday April 06, 2013
86-
Last Change : Saturday April 06, 2013
85+
Last Updated: Sunday April 07, 2013
86+
Last Change : Saturday December 08, 2012
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -210,7 +210,7 @@ <H1>2. Overview</H1>
210210
<LI>GEOS &gt;= 3.0
211211
<LI>Sqlite3 &gt;= 3.0.0
212212
<LI>GDAL/OGR &gt;= 1.4.x
213-
<LI>Qwt &gt;= 5.0 &amp; &lt; 6.1
213+
<LI>Qwt &gt;= 5.0 &amp; (&lt; 6.1 with internal QwtPolar)
214214
<LI>expat &gt;= 1.95
215215
</UL>
216216

@@ -2302,7 +2302,7 @@ <H3>5.4.9. Additional dependencies: Qwt</H3>
23022302
NOTE: PyQwt is not compatible with PyQt 4.9, so we will skip that.
23032303
</P>
23042304
<P>
2305-
Download the latest Qwt 5.x or 6.x source from:
2305+
Download the latest Qwt 6.0 source (6.1 does not work with the QwtPolar in QGIS) from:
23062306
</P>
23072307
<P>
23082308
<A HREF="http://sourceforge.net/projects/qwt">http://sourceforge.net/projects/qwt</A>
@@ -2312,71 +2312,25 @@ <H3>5.4.9. Additional dependencies: Qwt</H3>
23122312
Terminal.
23132313
</P>
23142314
<P>
2315-
Type these commands to build and install 5.x.x (assumes v5.2.2, adjust commands
2315+
Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands
23162316
for other version as needed):
23172317
</P>
23182318

23192319
<div class="code"><PRE>
2320+
cat &gt;&gt; qwtconfig.pri &lt;&lt;EOF
2321+
QWT_CONFIG -= QwtFramework
2322+
EOF
23202323
qmake -spec macx-g++
23212324
make -j [#cpus]
23222325
sudo make install
23232326

2324-
sudo install_name_tool -id /usr/local/qwt-5.2.2/lib/libqwt.5.dylib \
2325-
/usr/local/qwt-5.2.2/lib/libqwt.5.dylib
2327+
sudo install_name_tool -id /usr/local/qwt-6.0.2/lib/libqwt.6.dylib \
2328+
/usr/local/qwt-6.0.2/lib/libqwt.6.dylib
23262329
</PRE></div>
23272330

23282331
<P>
2329-
The Qwt shared library is now installed in /usr/local/qwt-5.x.x (x.x is
2330-
the minor.point version). Remember this for QGIS configuration.
2331-
</P>
2332-
<P>
2333-
Qwt 6.x.x is similarly built, but defaults to being installed as a framework:
2334-
</P>
2335-
2336-
<div class="code"><PRE>
2337-
cd &lt;Qwt 6.x.x source directory&gt;
2338-
qmake -spec macx-g++
2339-
make -j [#cpus]
2340-
sudo make install
2341-
</PRE></div>
2342-
2343-
<P>
2344-
<B>TODO:</B> Remedy for :
2345-
</P>
2346-
2347-
<div class="code"><PRE>
2348-
shrub:qwt-6.1-rc3 timlinux$ sudo make install
2349-
Password:
2350-
cd src/ &amp;&amp; make -f Makefile install
2351-
rm -f -r "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
2352-
cp -f -R "../lib/qwt.framework" "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
2353-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/html /usr/local/qwt-6.1.0-rc3/doc/
2354-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/man /usr/local/qwt-6.1.0-rc3/doc/
2355-
cd textengines/ &amp;&amp; make -f Makefile install
2356-
make[1]: Nothing to be done for `install'.
2357-
cd designer/ &amp;&amp; make -f Makefile install
2358-
rm -f libqwt_designer_plugin.dylib
2359-
linking plugins/designer/libqwt_designer_plugin.dylib
2360-
ld: library not found for -lqwt
2361-
collect2: ld returned 1 exit status
2362-
make[1]: *** [plugins/designer/libqwt_designer_plugin.dylib] Error 1
2363-
make: *** [sub-designer-install_subtargets-ordered] Error 2
2364-
</PRE></div>
2365-
2366-
<div class="code"><PRE>
2367-
sudo install_name_tool -id /usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt \
2368-
/usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt
2369-
</PRE></div>
2370-
2371-
<P>
2372-
This installs to the following location
2373-
</P>
2374-
<P>
2375-
/usr/local/qwt-6.x.x/lib/qwt.framework/qwt
2376-
/usr/local/qwt-6.x.x/lib/qwt.framework/Headers
2377-
</P>
2378-
<P>
2379-
(x.x is the minor.point version). Remember these for QGIS configuration.
2332+
The Qwt shared library is now installed in /usr/local/qwt-6.0.x (x is
2333+
the point version). Remember this for QGIS configuration.
23802334
</P>
23812335

23822336
<H3>5.4.10. Additional dependencies: Bison</H3>
@@ -3234,5 +3188,5 @@ <H1>9. Authors and Acknowledgments</H1>
32343188

32353189
</DIV>
32363190
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3237-
<!-- cmdline: txt2tags -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
3191+
<!-- cmdline: txt2tags -t html -o INSTALL.html INSTALL.t2t -->
32383192
</BODY></HTML>

‎doc/osx.t2t

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -504,70 +504,31 @@ The GPS tracking feature uses Qwt.
504504

505505
NOTE: PyQwt is not compatible with PyQt 4.9, so we will skip that.
506506

507-
Download the latest Qwt 5.x or 6.x source from:
507+
Download the latest Qwt 6.0 source (6.1 does not work with the QwtPolar in QGIS) from:
508508

509509
http://sourceforge.net/projects/qwt
510510

511511
Double-click the tarball to unpack it. Now, cd to the qwt source folder in a
512512
Terminal.
513513

514-
Type these commands to build and install 5.x.x (assumes v5.2.2, adjust commands
514+
Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands
515515
for other version as needed):
516516

517517
```
518+
cat >> qwtconfig.pri <<EOF
519+
QWT_CONFIG -= QwtFramework
520+
EOF
518521
qmake -spec macx-g++
519522
make -j [#cpus]
520523
sudo make install
521524

522-
sudo install_name_tool -id /usr/local/qwt-5.2.2/lib/libqwt.5.dylib \
523-
/usr/local/qwt-5.2.2/lib/libqwt.5.dylib
524-
```
525-
526-
The Qwt shared library is now installed in /usr/local/qwt-5.x.x (x.x is
527-
the minor.point version). Remember this for QGIS configuration.
528-
529-
Qwt 6.x.x is similarly built, but defaults to being installed as a framework:
530-
531-
```
532-
cd <Qwt 6.x.x source directory>
533-
qmake -spec macx-g++
534-
make -j [#cpus]
535-
sudo make install
536-
```
537-
538-
**TODO:** Remedy for :
539-
525+
sudo install_name_tool -id /usr/local/qwt-6.0.2/lib/libqwt.6.dylib \
526+
/usr/local/qwt-6.0.2/lib/libqwt.6.dylib
540527
```
541-
shrub:qwt-6.1-rc3 timlinux$ sudo make install
542-
Password:
543-
cd src/ && make -f Makefile install
544-
rm -f -r "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
545-
cp -f -R "../lib/qwt.framework" "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
546-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/html /usr/local/qwt-6.1.0-rc3/doc/
547-
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/man /usr/local/qwt-6.1.0-rc3/doc/
548-
cd textengines/ && make -f Makefile install
549-
make[1]: Nothing to be done for `install'.
550-
cd designer/ && make -f Makefile install
551-
rm -f libqwt_designer_plugin.dylib
552-
linking plugins/designer/libqwt_designer_plugin.dylib
553-
ld: library not found for -lqwt
554-
collect2: ld returned 1 exit status
555-
make[1]: *** [plugins/designer/libqwt_designer_plugin.dylib] Error 1
556-
make: *** [sub-designer-install_subtargets-ordered] Error 2
557-
```
558-
559-
560-
```
561-
sudo install_name_tool -id /usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt \
562-
/usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt
563-
```
564-
565-
This installs to the following location
566528

567-
/usr/local/qwt-6.x.x/lib/qwt.framework/qwt
568-
/usr/local/qwt-6.x.x/lib/qwt.framework/Headers
529+
The Qwt shared library is now installed in /usr/local/qwt-6.0.x (x is
530+
the point version). Remember this for QGIS configuration.
569531

570-
(x.x is the minor.point version). Remember these for QGIS configuration.
571532

572533
=== Additional dependencies: Bison ===
573534

0 commit comments

Comments
 (0)