From 41b0c923e6e9ee568edf78980bf0583c313128ef Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 10 Oct 2009 09:38:10 +0000 Subject: [PATCH] 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." --- CMakeModules/FindCOLLADA.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index b33275447..9d350f77c 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -44,7 +44,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h ) FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY - NAMES collada_dom collada14dom libcollada14dom21 + NAMES collada_dom collada14dom libcollada14dom21 libcollada14dom22 PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4 $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4 @@ -65,7 +65,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY ) FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG - NAMES collada_dom-d collada14dom-d libcollada14dom21-d + NAMES collada_dom-d collada14dom-d libcollada14dom21-d libcollada14dom22-d PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4-d @@ -86,7 +86,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_STATIC_LIBRARY - NAMES libcollada14dom21-s + NAMES libcollada14dom21-s libcollada14dom22-s PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4 $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4 @@ -107,7 +107,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY ) FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG - NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd + NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd libcollada14dom22-sd PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4-d