Skip to content
Permalink
Browse files

Added convenience paths for dependency search on windows (expecting c…

…:/msys)

git-svn-id: http://svn.osgeo.org/qgis/trunk@6453 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jan 23, 2007
1 parent 93cb758 commit c7d894cfa25ffd398ce17c4a321972076db7f26f
Showing with 12 additions and 12 deletions.
  1. +2 −2 cmake/FindExpat.cmake
  2. +2 −2 cmake/FindGDAL.cmake
  3. +2 −2 cmake/FindGEOS.cmake
  4. +2 −2 cmake/FindPostgres.cmake
  5. +2 −2 cmake/FindProj.cmake
  6. +2 −2 cmake/FindSqlite3.cmake
@@ -8,9 +8,9 @@
# EXPAT_LIBRARY


FIND_PATH(EXPAT_INCLUDE_DIR expat.h /usr/local/include /usr/include)
FIND_PATH(EXPAT_INCLUDE_DIR expat.h /usr/local/include /usr/include c:/msys/local/include)

FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATH /usr/local/lib /usr/lib)
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATH /usr/local/lib /usr/lib c:/msys/local/lib)

IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
SET(EXPAT_FOUND TRUE)
@@ -11,8 +11,8 @@

IF(WIN32)

FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include)
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATH /usr/local/lib /usr/lib)
FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include c:/msys/local/include)
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATH /usr/local/lib /usr/lib c:/msys/local/lib)


ELSE(WIN32)
@@ -7,9 +7,9 @@
# GEOS_LIBRARY


FIND_PATH(GEOS_INCLUDE_DIR geos.h /usr/local/include /usr/include)
FIND_PATH(GEOS_INCLUDE_DIR geos.h /usr/local/include /usr/include c:/msys/local/include)

FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATH /usr/local/lib /usr/lib)
FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATH /usr/local/lib /usr/lib c:/msys/local/include)

IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
SET(GEOS_FOUND TRUE)
@@ -11,11 +11,11 @@

IF(WIN32)
IF (NOT POSTGRES_INCLUDE_DIR)
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include)
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include c:/msys/local/include)
ENDIF (NOT POSTGRES_INCLUDE_DIR)

IF (NOT POSTGRES_LIBRARY)
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATH /usr/local/lib /usr/lib)
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATH /usr/local/lib /usr/lib c:/msys/local/lib)
ENDIF (NOT POSTGRES_LIBRARY)

ELSE(WIN32)
@@ -7,9 +7,9 @@
# PROJ_LIBRARY


FIND_PATH(PROJ_INCLUDE_DIR proj_api.h /usr/local/include /usr/include)
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h /usr/local/include /usr/include c:/msys/local/include)

FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATH /usr/local/lib /usr/lib)
FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATH /usr/local/lib /usr/lib c:/msys/local/include)

IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
SET(PROJ_FOUND TRUE)
@@ -7,9 +7,9 @@
# SQLITE3_LIBRARY


FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h /usr/local/include /usr/include)
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h /usr/local/include /usr/include c:/msys/local/include)

FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATH /usr/local/lib /usr/lib)
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATH /usr/local/lib /usr/lib c:/msys/local/lib)

IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
SET(SQLITE3_FOUND TRUE)

0 comments on commit c7d894c

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