Skip to content
Permalink
Browse files

add missing configure option;

fix mac build for release source

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_6_0@14603 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos
kyngchaos committed Nov 13, 2010
1 parent 285e1f8 commit ee50af343afd3ff275bae07b1548b7721504a40f
Showing with 22 additions and 6 deletions.
  1. +10 −4 INSTALL
  2. +8 −2 doc/osx.t2t
  3. +4 −0 src/mac/Contents/CMakeLists.txt
14 INSTALL
@@ -1,8 +1,8 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step

Last update: 20101105
Last change: 20101028
Last update: 20101113
Last change: 20101113

1. Introduction
2. Overview
@@ -1742,6 +1742,8 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
..


@@ -1755,6 +1757,8 @@ path and version as required):

cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
-D GRASS_PREFIX=/user/local/grass-6.4.0 \
..

@@ -1772,13 +1776,15 @@ script and add arch flags to the configuration:

cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
-D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
..


Bundling note: Older Qt versions may have problems with some Qt plugins and Qgis.
The way to handle this is bundle Qt inside the Qgis application. You can do this now
or wait to see if there are immediate crahses when running Qgis. It's also a good
The way to handle this is to bundle Qt inside the Qgis application. You can do this now
or wait to see if there are immediate crashes when running Qgis. It's also a good
idea to bundle Qt if you need to copy Qgis to other Macs (where you would have to
install Xcode just so Qt would install!).

@@ -468,6 +468,8 @@ mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
..
```

@@ -481,6 +483,8 @@ path and version as required):
```
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
-D GRASS_PREFIX=/user/local/grass-6.4.0 \
..
```
@@ -498,13 +502,15 @@ sudo chmod +x /usr/local/bin/python32

cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
-D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
..
```

__Bundling note:__ Older Qt versions may have problems with some Qt plugins and Qgis.
The way to handle this is bundle Qt inside the Qgis application. You can do this now
or wait to see if there are immediate crahses when running Qgis. It's also a good
The way to handle this is to bundle Qt inside the Qgis application. You can do this now
or wait to see if there are immediate crashes when running Qgis. It's also a good
idea to bundle Qt if you need to copy Qgis to other Macs (where you would have to
install Xcode just so Qt would install!).

@@ -4,6 +4,10 @@

SET(COMPLETE_VERSION_WITH_RELEASE_NAME \"${COMPLETE_VERSION}-${RELEASE_NAME}\")

IF (NOT EXISTS SVN_MARKER)
SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file
ENDIF (NOT EXISTS SVN_MARKER)

ADD_CUSTOM_TARGET(Info.plist ALL
DEPENDS ${SVN_MARKER}
COMMAND ${CMAKE_COMMAND}

0 comments on commit ee50af3

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