master merge

qgis · Aug 6, 2012 · e09a0a5 · e09a0a5
2 parents 53da893 + 3b3f674
commit e09a0a5
Show file tree

Hide file tree

Showing 218 changed files with 11,335 additions and 4,219 deletions.
diff --git a/INSTALL b/INSTALL
diff --git a/cmake/Bison.cmake b/cmake/Bison.cmake
@@ -12,7 +12,7 @@ MACRO(FIND_BISON)
     IF (MSVC)
       FIND_PROGRAM(BISON_EXECUTABLE PATHS
       		   NAMES bison.exe
-	           PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
+	           PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
 	)
     ELSE (MSVC)
       FIND_PROGRAM(BISON_EXECUTABLE bison)

diff --git a/cmake/FindFcgi.cmake b/cmake/FindFcgi.cmake
@@ -10,20 +10,14 @@ FIND_PATH(FCGI_INCLUDE_DIR
   /usr/include
   /usr/local/include
   /usr/include/fastcgi
-  #MSVC
   "$ENV{LIB_DIR}/include"
   $ENV{INCLUDE}
-  #mingw
-  c:/msys/local/include
   )
 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
+  "$ENV{LIB}"
   )
 
 IF (FCGI_INCLUDE_DIR AND FCGI_LIBRARY)

diff --git a/cmake/FindGEOS.cmake b/cmake/FindGEOS.cmake
@@ -25,11 +25,8 @@ IF(WIN32)
   IF (MSVC)
     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}/lib"
+      "$ENV{LIB_DIR}/lib"
       $ENV{LIB}
-      #mingw
-      c:/msys/local/lib
-      NO_DEFAULT_PATH
       )
     IF (GEOS_LIBRARY)
        SET (

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -23,25 +23,18 @@
 ##
 
 IF(WIN32)
-
-  SET(GSL_MINGW_PREFIX "c:/msys/local" )
-  SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")
-
   FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h 
-    ${GSL_MINGW_PREFIX}/include 
-    ${GSL_MSVC_PREFIX}/include
+    ${LIB_DIR}/include 
     $ENV{INCLUDE}
     )
 
   FIND_LIBRARY(GSL_LIB gsl PATHS 
-    ${GSL_MINGW_PREFIX}/lib 
-    ${GSL_MSVC_PREFIX}/lib
+    ${LIB_DIR}/lib
     $ENV{LIB}
     )
 
   FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS 
-    ${GSL_MINGW_PREFIX}/lib 
-    ${GSL_MSVC_PREFIX}/lib
+    ${LIB_DIR}/lib
     $ENV{LIB}
   )
 

diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
@@ -22,20 +22,13 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
   $ENV{INCLUDE}
   /usr/local/include
   /usr/include
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
   )
-FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
 
 FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
   "$ENV{LIB_DIR}/lib"
   $ENV{LIB}
   /usr/local/lib
   /usr/lib
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
   )
 
 IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)

diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -37,21 +37,14 @@ IF (APPLE)
 ENDIF (APPLE)
 
 FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
-  "$ENV{LIB_DIR}/include/proj"
+  "$ENV{INCLUDE}"
   "$ENV{LIB_DIR}/include"
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
   )
-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
 
 FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
+  "$ENV{LIB}"
   "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
   )
-FIND_LIBRARY(PROJ_LIBRARY NAMES proj)
 
 IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
    SET(PROJ_FOUND TRUE)

diff --git a/cmake/FindQwt.cmake b/cmake/FindQwt.cmake
@@ -24,7 +24,7 @@ FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS
   /usr/lib
   /usr/local/lib
   "$ENV{LIB_DIR}/lib" 
-  "$ENV{LIB}/lib" 
+  "$ENV{LIB}" 
   )
 
 IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

diff --git a/cmake/FindSPATIALITE.cmake b/cmake/FindSPATIALITE.cmake
@@ -39,21 +39,16 @@ IF (APPLE)
 ENDIF (APPLE)
 
 FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
+  "$ENV{INCLUDE}"
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/spatialite"
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
   )
-FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h)
 
-FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite PATHS
-  "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
+MESSAGE(STATUS "LIB:${LIB} LIB_DIR:${LIB_DIR}")
+FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite spatialite_i PATHS
+  $ENV{LIB}
+  $ENV{LIB_DIR}/lib
   )
-FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite)
 
 IF (SPATIALITE_INCLUDE_DIR AND SPATIALITE_LIBRARY)
    SET(SPATIALITE_FOUND TRUE)

diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
@@ -40,27 +40,19 @@ ENDIF (APPLE)
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/sqlite"
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
-  )
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
+  "$ENV{INCLUDE}"
+)
 
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
   "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
+  "$ENV{LIB}/lib"
   )
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
 
 IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
    SET(SQLITE3_FOUND TRUE)
 ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
 
-
 IF (SQLITE3_FOUND)
-
    IF (NOT SQLITE3_FIND_QUIETLY)
       MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
    ENDIF (NOT SQLITE3_FIND_QUIETLY)

diff --git a/cmake/Flex.cmake b/cmake/Flex.cmake
@@ -12,7 +12,7 @@ MACRO(FIND_FLEX)
       IF (MSVC)
         FIND_PROGRAM(FLEX_EXECUTABLE
                      NAMES flex.exe
-                     PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
+                     PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
                     )
       ELSE(MSVC)
         FIND_PROGRAM(FLEX_EXECUTABLE flex)