From Gino van den Bergen, "The FindGDAL.cmake seems to be broken in OSG 2.6.1 for locating gdal.h through enviroment variable GDAL_DIR.
Also, I've modified the FindCOLLADA.cmake to locate the current 2.1 versions of the COLLADA DOM in the build directories under VC8. I've also added a COLLADA_LIBRARY_DEBUG spec. Other flavors may be added depending on compiler version and DOM version."
This commit is contained in:
parent
b147a22af1
commit
e02ae68aa9
@ -30,8 +30,33 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
|
|||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(COLLADA_LIBRARY
|
FIND_LIBRARY(COLLADA_LIBRARY
|
||||||
NAMES collada_dom collada14dom
|
NAMES collada_dom collada14dom libcollada14dom21
|
||||||
PATHS
|
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
|
||||||
$ENV{COLLADA_DIR}/lib-dbg
|
$ENV{COLLADA_DIR}/lib-dbg
|
||||||
$ENV{COLLADA_DIR}
|
$ENV{COLLADA_DIR}
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
# #include "gdal.h"
|
# #include "gdal.h"
|
||||||
|
|
||||||
FIND_PATH(GDAL_INCLUDE_DIR gdal.h
|
FIND_PATH(GDAL_INCLUDE_DIR gdal.h
|
||||||
|
PATHS
|
||||||
$ENV{GDAL_DIR}
|
$ENV{GDAL_DIR}
|
||||||
NO_DEFAULT_PATH
|
NO_DEFAULT_PATH
|
||||||
PATH_SUFFIXES include
|
PATH_SUFFIXES include
|
||||||
|
Loading…
Reference in New Issue
Block a user