[QGIS Commit] r8194 - trunk/qgis

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-03-07 12:03:41 -0500 (Fri, 07 Mar 2008)
New Revision: 8194

Modified:
   trunk/qgis/INSTALL
Log:
Regenerated INSTALL procedure to reflect Williams changes


Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL	2008-03-07 17:00:57 UTC (rev 8193)
+++ trunk/qgis/INSTALL	2008-03-07 17:03:41 UTC (rev 8194)
@@ -766,38 +766,53 @@
 	========================
 
 CMake supports out of source build so we will create a 'build' dir for the
-build process . By convention I build my software into a dir called 'apps'
-in my home directory. If you have the correct permissions you may want to 
-build straight into your /Applications folder (although personally I dont 
-really recommend this). The instructions below assume you are building into 
-a pre-existing ${HOME}/apps directory ...
+build process . By convention I build my software into a dir called 'apps' in
+my home directory. If you have the correct permissions you may want to build
+straight into your /Applications folder. The instructions below assume you are
+building into a pre-existing ${HOME}/apps directory ...
 
 
-  cd qgis 
-  mkdir build 
-  cd build 
+  cd qgis
+  mkdir build
+  cd build
   cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release ..
 
 
-Leopard note: To find the custom install of SIP on Leopard, add -D SIP_BINARY_PATH=/usr/local/bin/sip to the cmake command above, before the .. at the end, ie:
+Leopard note: To find the custom install of SIP on Leopard, add ""-
+D SIP_BINARY_PATH=/usr/local/bin/sip"" to the cmake command above,
+before the .. at the end, ie:
 
 
-  cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release -D SIP_BINARY_PATH=/usr/local/bin/sip ..
+  cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release -
+  D SIP_BINARY_PATH=/usr/local/bin/sip ..
 
 
-To use a specific GRASS version, You can optionally use the following 
-cmake invocation (with modifications to suite your system (thanks William 
-Kyngesburye for this hint):
+To use the application build of GRASS on OSX, you can optionally use the
+following cmake invocation (minimum GRASS 6.3 required, substitute the GRASS
+version as required):
 
 
   cmake -D CMAKE_INSTALL_PREFIX=${HOME}/apps/ \
-        -D GRASS_INCLUDE_DIR=/Applications/GRASS-6.3.app/Contents/Resources/include \
-        -D GRASS_PREFIX=/Applications/GRASS-6.3.app/Contents/Resources \
+        -D GRASS_INCLUDE_DIR=/Applications/GRASS-6.3.app/Contents/MacOS/
+        include \
+        -D GRASS_PREFIX=/Applications/GRASS-6.3.app/Contents/MacOS \
         -D CMAKE_BUILD_TYPE=Release \
         ..
 
 
+Or, to use a Unix-style build of GRASS, use the following cmake invocation
+(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
+path and version as required):
 
+
+  cmake -D CMAKE_INSTALL_PREFIX=${HOME}/apps/ \
+    -D GRASS_INCLUDE_DIR=/user/local/grass-6.3.0/include \
+    -D GRASS_PREFIX=/user/local/grass-6.3.0 \
+    -D CMAKE_BUILD_TYPE=Release \
+    ..
+
+
+
 	4.8. Building
 	=============
 
@@ -821,7 +836,7 @@
 	5.1. Building QGIS with Qt4.x
 	=============================
 
-Requires: Ubuntu Edgy / Debian derived distro
+Requires: Ubuntu Gutsy / Debian derived distro
 
 These notes are current for Ubuntu 7.10 - other versions and Debian derived 
 distros may require slight variations in package names.