diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index ef37403e6..046419a29 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -30,8 +30,33 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h ) FIND_LIBRARY(COLLADA_LIBRARY - NAMES collada_dom collada14dom + NAMES collada_dom collada14dom libcollada14dom21 PATHS + $ENV{COLLADA_DIR}/build/vc8-1.4 + $ENV{COLLADA_DIR}/lib + $ENV{COLLADA_DIR}/lib-dbg + $ENV{COLLADA_DIR} + $ENV{OSGDIR}/lib + $ENV{OSGDIR} + $ENV{OSG_ROOT}/lib + ~/Library/Frameworks + /Library/Frameworks + /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib + /usr/freeware/lib64 +) + +FIND_LIBRARY(COLLADA_LIBRARY_DEBUG + NAMES collada_dom-d collada14dom-d libcollada14dom21-d + PATHS + $ENV{COLLADA_DIR}/build/vc8-1.4-d $ENV{COLLADA_DIR}/lib $ENV{COLLADA_DIR}/lib-dbg $ENV{COLLADA_DIR} diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake index 4ef6aaa13..4070baf0d 100644 --- a/CMakeModules/FindGDAL.cmake +++ b/CMakeModules/FindGDAL.cmake @@ -20,6 +20,7 @@ # #include "gdal.h" FIND_PATH(GDAL_INCLUDE_DIR gdal.h + PATHS $ENV{GDAL_DIR} NO_DEFAULT_PATH PATH_SUFFIXES include