Skip to content
Permalink
Browse files

update install/build documentation & cmake updates:

- split install document into multiple files
- reorder chapters
- update msvc part (shortend add reference to OSGeo4W dependencies)
- update CMake files to look in $ENV{LIB} and $ENV{INCLUDE}


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14440 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Oct 27, 2010
1 parent 2534385 commit 957dd0cab6ee7f8c2a9f1ef12c71bc66cf364439
Showing with 2,630 additions and 4,038 deletions.
  1. +914 −1,677 INSTALL
  2. +3 −1 cmake/FindFcgi.cmake
  3. +2 −6 cmake/FindGDAL.cmake
  4. +3 −6 cmake/FindGEOS.cmake
  5. +1 −1 cmake/FindGRASS.cmake
  6. +4 −1 cmake/FindGSL.cmake
  7. +2 −0 cmake/FindIconv.cmake
  8. +4 −1 cmake/FindQWT.cmake
  9. +15 −2,343 doc/INSTALL.t2t
  10. +28 −0 doc/authors.t2t
  11. +1 −1 doc/index.dox
  12. +514 −0 doc/linux.t2t
  13. +132 −0 doc/msvc.t2t
  14. +385 −0 doc/msys.t2t
  15. +585 −0 doc/osx.t2t
  16. +36 −0 doc/overview.t2t
  17. +1 −1 src/core/CMakeLists.txt
2,591 INSTALL

Large diffs are not rendered by default.

@@ -12,14 +12,16 @@ FIND_PATH(FCGI_INCLUDE_DIR
/usr/include/fastcgi
#MSVC
"$ENV{LIB_DIR}/include"
$ENV{INCLUDE}
#mingw
c:/msys/local/include
)
FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi PATHS
FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi libfcgi PATHS
/usr/local/lib
/usr/lib
#MSVC
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
#mingw
c:/msys/local/lib
)
@@ -23,13 +23,9 @@ IF(WIN32)
ENDIF (MINGW)

IF (MSVC)
SET (
GDAL_INCLUDE_DIR
"$ENV{LIB_DIR}/include/gdal"
CACHE STRING INTERNAL
)
FIND_PATH(GDAL_INCLUDE_DIR gdal.h "$ENV{LIB_DIR}/include/gdal" $ENV{INCLUDE})
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal_i PATHS
"$ENV{LIB_DIR}/lib" /usr/lib c:/msys/local/lib)
"$ENV{LIB_DIR}/lib" $ENV{LIB} /usr/lib c:/msys/local/lib)
IF (GDAL_LIBRARY)
SET (
GDAL_LIBRARY;odbc32;odbccp32
@@ -22,13 +22,10 @@ IF(WIN32)
ENDIF (MINGW)

IF (MSVC)
SET (
GEOS_INCLUDE_DIR
"$ENV{LIB_DIR}/include"
CACHE STRING INTERNAL
)
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
FIND_LIBRARY(GEOS_LIBRARY NAMES geos geos_c_i PATHS
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
$ENV{LIB}
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
@@ -44,7 +44,7 @@ ENDMACRO (CHECK_GRASS)
# search for grass installations

# list of paths which to search - user's choice as first
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass)
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass $ENV{GRASS_PREFIX})

# mac-specific path
IF (APPLE)
@@ -31,16 +31,19 @@ IF(WIN32)
FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
${GSL_MINGW_PREFIX}/include
${GSL_MSVC_PREFIX}/include
$ENV{INCLUDE}
)

FIND_LIBRARY(GSL_LIB gsl PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
$ENV{LIB}
)

FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
$ENV{LIB}
)

SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
@@ -119,7 +122,7 @@ IF(GSL_LIBRARIES)

SET(GSL_FOUND 1)

MESSAGE(STATUS "Using GSL from ${GSL_PREFIX}")
MESSAGE(STATUS "Found GSL: ${GSL_LIB}")

ENDIF(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS)
ENDIF(GSL_LIBRARIES)
@@ -19,6 +19,7 @@
# searching for the same item do nothing.
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
"$ENV{LIB_DIR}/include"
$ENV{INCLUDE}
/usr/local/include
/usr/include
#mingw
@@ -29,6 +30,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h)

FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
/usr/local/lib
/usr/lib
#mingw
@@ -19,19 +19,22 @@ FIND_PATH(QWT_INCLUDE_DIR qwt.h
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt4 qwt
)
FIND_LIBRARY(QWT_LIBRARY qwt PATHS
FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwtn5 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
)
IF (NOT QWT_LIBRARY)
# try using ubuntu lib naming
FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
)
ENDIF (NOT QWT_LIBRARY)

0 comments on commit 957dd0c

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