Skip to content
Permalink
Browse files

update mac install documentation and fix GSL include

  • Loading branch information
3nids committed Sep 30, 2014
1 parent 4d30e05 commit df7c965a657581756afe53ca7e8858c0647923c4
Showing with 18 additions and 8 deletions.
  1. +17 −8 INSTALL
  2. +1 −0 src/app/CMakeLists.txt
25 INSTALL
@@ -1175,7 +1175,7 @@ from source and rather use frameworks wherever possible.
some fiddling with the system. It is best to stick with a single, default,
architecture build and follow these instructions for an initial build.
Included are notes for building on Mac OS X 10.5 (Leopard), 10.6
(Snow Leopard), 10.7 (Lion) and 10.8 (Mt. Lion).
(Snow Leopard), 10.7 (Lion), 10.8 (Mt. Lion) and 10.9 (Mavericks)
(These names will be used throughout the instructions.)
Make sure to read each section completely before typing the first command you see.

@@ -1457,8 +1457,9 @@ your own risk.
5.4.5. Additional dependencies: SIP
===================================

Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
(or a later working version when available)
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install either
prior version: 4.14.6.
later version: 4.16.3+

Retrieve the python bindings toolkit SIP from

@@ -1514,6 +1515,12 @@ for Mt. Lion:
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk

for Mavericks:

python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk


continue...

Then continue with compilation and installation:
@@ -1546,14 +1553,16 @@ Edit QScintilla-gpl-2.x.x/Qt4Qt5/qscintilla.pro in the following manner:
target.path = $$[QT_INSTALL_LIBS] --> target.path = /usr/local/lib
header.path = $$[QT_INSTALL_HEADERS] --> header.path = /usr/local/include

Save the qscintilla.pro file and build the QScintilla2 C++ library (adjust the install_name_tool command for the version installed):
Save the qscintilla.pro file and build the QScintilla2 C++ library:

qmake -spec macx-g++ qscintilla.pro
make -j [#cpus]
sudo make install

adjust the install_name_tool command for the version installed of QScintilla installed:

sudo install_name_tool -id /usr/local/lib/libqscintilla2.9.dylib \
/usr/local/lib/libqscintilla2.9.dylib
sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \
/usr/local/lib/libqscintilla2.11.dylib

This installs QScintilla2's dylib in /usr/local/lib/ and the header files in
/usr/local/include/Qsci/, both of which should be automatically found when
@@ -1614,7 +1623,7 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64

Lion and Mt. Lion system Python
Lion, Mt. Lion, and Mavericks system Python

Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the use-arch option:
@@ -1637,7 +1646,7 @@ Then make again.
This will create the Qsci.so module in /Library/Python/2.x/site-packages/PyQt4.
Like PyQt, it needs help to not install in system locations.

Snow Leopard: substitute '2.6' for Python version
Snow Leopard: substitute 2.6 for Python version

cd <QScintilla2 source dir>
cd Python
@@ -420,6 +420,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../ui
${QWT_INCLUDE_DIR}
${QT_QTUITOOLS_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${QEXTSERIALPORT_INCLUDE_DIR}
../analysis/raster
../analysis/openstreetmap

0 comments on commit df7c965

Please sign in to comment.
You can’t perform that action at this time.