sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8203 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2008-03-10 16:08:43 +00:00
parent 7e2bfcfc20
commit 9b5f9c3672
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/FindGEOS.cmake
View File

@ -7,22 +7,28 @@
# GEOS_LIBRARY # 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 FIND_PATH(GEOS_INCLUDE_DIR geos.h
"$ENV{LIB_DIR}/include"
/usr/local/include /usr/local/include
/usr/include /usr/include
#MSVC
"$ENV{LIB_DIR}/include"
#mingw #mingw
c:/msys/local/include c:/msys/local/include
NO_DEFAULT_PATH
) )
FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
"$ENV{LIB_DIR}/lib"
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
#MSVC
"$ENV{LIB_DIR}/lib"
#mingw #mingw
c:/msys/local/lib c:/msys/local/lib
NO_DEFAULT_PATH
) )
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY) IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)

14
cmake/FindProj.cmake
View File

@ -7,20 +7,28 @@
# PROJ_LIBRARY # 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 FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
"$ENV{LIB_DIR}/include/proj"
"$ENV{LIB_DIR}/include"
/usr/local/include /usr/local/include
/usr/include /usr/include
#msvc
"$ENV{LIB_DIR}/include/proj"
#mingw #mingw
c:/msys/local/include c:/msys/local/include
NO_DEFAULT_PATH
) )
FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS
"$ENV{LIB_DIR}/lib"
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
"$ENV{LIB_DIR}/lib"
c:/msys/local/lib c:/msys/local/lib
NO_DEFAULT_PATH
) )
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY) IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)