[QGIS Commit] r14603 - in branches/Release-1_6_0: . doc src/mac/Contents

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-11-13 08:39:41 -0800 (Sat, 13 Nov 2010)
New Revision: 14603

Modified:
   branches/Release-1_6_0/INSTALL
   branches/Release-1_6_0/doc/osx.t2t
   branches/Release-1_6_0/src/mac/Contents/CMakeLists.txt
Log:
add missing configure option;
fix mac build for release source

Modified: branches/Release-1_6_0/INSTALL
===================================================================
--- branches/Release-1_6_0/INSTALL	2010-11-13 16:35:20 UTC (rev 14602)
+++ branches/Release-1_6_0/INSTALL	2010-11-13 16:39:41 UTC (rev 14603)
@@ -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 @@
   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 @@
 
   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 @@
   
   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!).
 

Modified: branches/Release-1_6_0/doc/osx.t2t
===================================================================
--- branches/Release-1_6_0/doc/osx.t2t	2010-11-13 16:35:20 UTC (rev 14602)
+++ branches/Release-1_6_0/doc/osx.t2t	2010-11-13 16:39:41 UTC (rev 14603)
@@ -468,6 +468,8 @@
 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 @@
 ```
 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 @@
 
 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!).
 

Modified: branches/Release-1_6_0/src/mac/Contents/CMakeLists.txt
===================================================================
--- branches/Release-1_6_0/src/mac/Contents/CMakeLists.txt	2010-11-13 16:35:20 UTC (rev 14602)
+++ branches/Release-1_6_0/src/mac/Contents/CMakeLists.txt	2010-11-13 16:39:41 UTC (rev 14603)
@@ -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}