Skip to content
Permalink
Browse files

Added the possibility to use these libs from non default locations by…

… specifying them in LIB_DIR. Before this change, the presence of the lib in /usr or /usr/local would override command line specified paths

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8203 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Mar 10, 2008
1 parent b211eaf commit 10d134952d35889839daa3f67ad9196e5ab26bd8
Showing with 21 additions and 7 deletions.
  1. +10 −4 cmake/FindGEOS.cmake
  2. +11 −3 cmake/FindProj.cmake
@@ -7,22 +7,28 @@
# GEOS_LIBRARY


# Normally there is no need to specify /usr/... paths because
# cmake will look there automatically. However the NO_DEFAULT_PATH
# prevents this behaviour allowing you to use no standard file
# locations in preference over standard ones. Note in this case
# you then need to explicitly add /usr and /usr/local prefixes
# to the search list. This applies both to FIND_PATH and FIND_LIBRARY
FIND_PATH(GEOS_INCLUDE_DIR geos.h
"$ENV{LIB_DIR}/include"
/usr/local/include
/usr/include
#MSVC
"$ENV{LIB_DIR}/include"
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)

FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
"$ENV{LIB_DIR}/lib"
/usr/local/lib
/usr/lib
#MSVC
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)

IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
@@ -7,20 +7,28 @@
# PROJ_LIBRARY


# Normally there is no need to specify /usr/... paths because
# cmake will look there automatically. However the NO_DEFAULT_PATH
# prevents this behaviour allowing you to use no standard file
# locations in preference over standard ones. Note in this case
# you then need to explicitly add /usr and /usr/local prefixes
# to the search list. This applies both to FIND_PATH and FIND_LIBRARY
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
"$ENV{LIB_DIR}/include/proj"
"$ENV{LIB_DIR}/include"
/usr/local/include
/usr/include
#msvc
"$ENV{LIB_DIR}/include/proj"
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)

FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS
"$ENV{LIB_DIR}/lib"
/usr/local/lib
/usr/lib
"$ENV{LIB_DIR}/lib"
c:/msys/local/lib
NO_DEFAULT_PATH
)

IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)

0 comments on commit 10d1349

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