mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorder the collada search components so that the built-in dependencies have higher priority.

metadata
Edgar Velazquez-Armendariz 2014-01-25 23:40:39 -05:00
parent 330844dc60
commit ad8563138a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/cmake/FindCOLLADA.cmake
View File

@ -46,7 +46,7 @@ else()
set (COLLADADOM_VERSION "14") set (COLLADADOM_VERSION "14")
set (COLLADADOM_VERSION_PT "1.4") set (COLLADADOM_VERSION_PT "1.4")
endif() endif()
set(COLLADA_VERSIONS "2.4" 24 23 22 21 20 2) set(COLLADA_VERSIONS 24 "2.4" 23 22 21 20 2)
# Default search paths # Default search paths
@ -203,15 +203,15 @@ set(Collada_library_paths
# Construct the possible names for the DOM library # Construct the possible names for the DOM library
set(COLLADADOM_NAMES set(COLLADADOM_NAMES
collada-dom
collada${COLLADADOM_VERSION}dom collada${COLLADADOM_VERSION}dom
Collada${COLLADADOM_VERSION}Dom Collada${COLLADADOM_VERSION}Dom
collada-dom
) )
if (MSVC) if (MSVC)
set(COLLADADOM_NAMES ${COLLADADOM_NAMES} list(APPEND COLLADADOM_NAMES
libcollada-dom
libCollada${COLLADADOM_VERSION}Dom libCollada${COLLADADOM_VERSION}Dom
libcollada${COLLADADOM_VERSION}dom libcollada${COLLADADOM_VERSION}dom
libcollada-dom
) )
endif() endif()
@ -227,11 +227,11 @@ endif()
set(COLLADADOM_NAMES_BASE ${COLLADADOM_NAMES}) set(COLLADADOM_NAMES_BASE ${COLLADADOM_NAMES})
foreach(name ${COLLADADOM_NAMES_BASE}) foreach(name ${COLLADADOM_NAMES_BASE})
foreach(version ${COLLADA_VERSIONS}) foreach(version ${COLLADA_VERSIONS})
list(APPEND COLLADADOM_NAMES "${name}${version}-dp" "${name}${version}") list(APPEND COLLADADOM_NAMES "${name}${version}" "${name}${version}-dp")
if(MSVC) if(MSVC)
foreach(vc_suffix ${VC_SUFFIXES}) foreach(vc_suffix ${VC_SUFFIXES})
list(APPEND COLLADADOM_NAMES "${name}${version}-dp-${vc_suffix}" list(APPEND COLLADADOM_NAMES "${name}${version}-${vc_suffix}"
"${name}${version}-${vc_suffix}") "${name}${version}-dp-${vc_suffix}")
endforeach() endforeach()
endif() endif()
endforeach() endforeach()