[QGIS Commit] r15623 - in trunk/qgis: . doc

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2011-03-27 16:37:27 -0700 (Sun, 27 Mar 2011)
New Revision: 15623

Modified:
   trunk/qgis/INSTALL
   trunk/qgis/doc/osx.t2t
Log:
mac install update

Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL	2011-03-27 18:34:00 UTC (rev 15622)
+++ trunk/qgis/INSTALL	2011-03-27 23:37:27 UTC (rev 15623)
@@ -1,8 +1,8 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
 
-Last update: 20110201
-Last change: 20110201
+Last update: 20110327
+Last change: 20110306
 
   1. Introduction
   2. Overview
@@ -758,9 +758,9 @@
 vcexpress.  Use File / Open / Project/Solutions and open the
 qgis-x.y.z.sln File in your project directory.
 
-You probably want to change the Solution Configuration from Debug
-to RelWithDebInfo (Release with Debug Info)  or Release before you
-build QGIS using the ALL_BUILD target.
+Change Solution Configuration from Debug to RelWithDebInfo (Release
+with Debug Info)  or Release before you build QGIS using the ALL_BUILD
+target (otherwise you need debug libraries that are not included).
 
 After the build completed you should install QGIS using the INSTALL target.
 
@@ -1641,8 +1641,6 @@
   5.3. Install CMake for OSX
   ==========================
 
-(Only needed for a cmake build.)
-
 Get the latest source release from here:
 
 
@@ -1762,7 +1760,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 CMAKE_BUILD_TYPE=MinSizeRel \
+  -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -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 \
   ..
@@ -1777,7 +1776,8 @@
 
 
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
-  -D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
+  -D CMAKE_BUILD_TYPE=MinSizeRel \
+  -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -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 \
@@ -1796,7 +1796,8 @@
   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 CMAKE_BUILD_TYPE=MinSizeRel \
+  -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -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 \

Modified: trunk/qgis/doc/osx.t2t
===================================================================
--- trunk/qgis/doc/osx.t2t	2011-03-27 18:34:00 UTC (rev 15622)
+++ trunk/qgis/doc/osx.t2t	2011-03-27 23:37:27 UTC (rev 15623)
@@ -353,8 +353,6 @@
 
 == Install CMake for OSX ==
 
-(Only needed for a cmake build.)
-
 Get the latest source release from here:
 
 ``` 
@@ -467,7 +465,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 CMAKE_BUILD_TYPE=MinSizeRel \
+-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -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 \
 ..
@@ -482,7 +481,8 @@
 
 ```
 cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
--D CMAKE_BUILD_TYPE=MinSizeRel -D WITH_INTERNAL_SPATIALITE=FALSE \
+-D CMAKE_BUILD_TYPE=MinSizeRel \
+-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -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 \
@@ -501,7 +501,8 @@
 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 CMAKE_BUILD_TYPE=MinSizeRel \
+-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -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 \