From 4cb58c703c50abf6f5729e558575e48a4b9381c4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 23 Dec 2010 10:07:27 +0000 Subject: [PATCH] From Per Fahlberg, "The FindCOLLADA.cmake module failed to find the static libs for the latest collada dom, attached is the fixed file." --- CMakeModules/FindCOLLADA.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 9d4b8f760..b7d28b577 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -101,7 +101,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_STATIC_LIBRARY - NAMES libcollada14dom21-s libcollada14dom22-s + NAMES libcollada14dom21-s libcollada14dom22-s libcollada14dom.a PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4 $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4 @@ -124,7 +124,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY ) FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG - NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd libcollada14dom22-sd + NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd libcollada14dom22-sd libcollada14dom-d.a PATHS ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4-d