Changeset 10626

Show
Ignore:
Timestamp:
10/10/09 11:38:10 (5 years ago)
Author:
robert
Message:

From Roger James, "When you merged my last set of changes into FindCOLLADA.cmake you omitted the changes to find the DOM22 libraries. Collada 1.4 DOM 2.2 seems to work OK for me on windows platforms. I have attached the changes again if you want to apply them."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake

    r10336 r10626  
    4545 
    4646FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY  
    47     NAMES collada_dom collada14dom libcollada14dom21 
     47    NAMES collada_dom collada14dom libcollada14dom21 libcollada14dom22 
    4848    PATHS 
    4949    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4 
     
    6666 
    6767FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG  
    68     NAMES collada_dom-d collada14dom-d libcollada14dom21-d 
     68    NAMES collada_dom-d collada14dom-d libcollada14dom21-d libcollada14dom22-d 
    6969    PATHS 
    7070    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d 
     
    8787 
    8888FIND_LIBRARY(COLLADA_STATIC_LIBRARY  
    89     NAMES libcollada14dom21-s 
     89    NAMES libcollada14dom21-s  libcollada14dom22-s 
    9090    PATHS 
    9191    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4 
     
    108108 
    109109FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG  
    110     NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd 
     110    NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd libcollada14dom22-sd 
    111111    PATHS 
    112112    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d