From f8a65a225f5d54ec3f984d9acbe4c7aad53a65f7 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 15 Nov 2022 09:41:40 +0100 Subject: [PATCH] Merge pull request #21 from elsid/3.6_collada Support more ways to build with dependency to collada-dom library --- CMakeModules/FindCOLLADA.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 7c7d2905327..28b2c02bda7 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -64,6 +64,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h ${COLLADA_DOM_ROOT}/include $ENV{COLLADA_DIR}/include $ENV{COLLADA_DIR} + $ENV{COLLADA_DIR}/include/collada-dom2.5 ~/Library/Frameworks /Library/Frameworks /opt/local/Library/Frameworks #macports @@ -185,8 +186,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ${ACTUAL_3DPARTY_DIR}/lib ) - # find extra libraries that the static linking requires - +IF (COLLADA_STATIC_LIBRARY) FIND_PACKAGE(LibXml2) IF (LIBXML2_FOUND) SET(COLLADA_LIBXML_LIBRARY "${LIBXML2_LIBRARIES}" CACHE FILEPATH "" FORCE) @@ -309,7 +309,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw ${ACTUAL_3DPARTY_DIR}/lib ) - +ENDIF() SET(COLLADA_FOUND "NO") IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)