From 87788c2360365a33e3959830eacc5f2e5290eb44 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 29 Jun 2007 16:06:52 +0000 Subject: [PATCH] From Jan Ciger, "I am attaching a fix for the COLLADA plugin on non-windows systems. The COLLADA modules STLDatabase, LIBXMLPlugin and stdErrPlugin are statically included in the main COLLADA library on Linux and shouldn't be linked separately - those libraries do not exist in the default Linux build and the compilation will fail. Second issue - the current version of the COLLADA plugin (both current HEAD in Subversion and the one in stable 2.0) do not work right with the stable COLLADA DOM 1.4.1. I am getting the following error: " --- src/osgPlugins/dae/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt index 9b3acbd80..637ccf43d 100644 --- a/src/osgPlugins/dae/CMakeLists.txt +++ b/src/osgPlugins/dae/CMakeLists.txt @@ -20,9 +20,11 @@ SET(TARGET_H domSourceReader.h ) IF(WIN32) -SET(TARGET_EXTERNAL_LIBRARIES libcollada_dom libcollada_dae libcollada_STLDatabase libcollada_LIBXMLPlugin libcollada_stdErrPlugin libxml2 ) + SET(TARGET_EXTERNAL_LIBRARIES libcollada_dom libcollada_dae libcollada_STLDatabase libcollada_LIBXMLPlugin libcollada_stdErrPlugin libxml2 ) ELSE(WIN32) -SET(TARGET_EXTERNAL_LIBRARIES collada_dom collada_dae collada_STLDatabase collada_LIBXMLPlugin collada_stdErrPlugin xml2 ) + #SET(TARGET_EXTERNAL_LIBRARIES collada_dom collada_dae collada_STLDatabase collada_LIBXMLPlugin collada_stdErrPlugin xml2 ) + # JC hack STLDatabase and XMLPlugin are statically linked on Linux + SET(TARGET_EXTERNAL_LIBRARIES collada_dom collada_dae xml2 ) ENDIF(WIN32) SET(TARGET_LIBRARIES_VARS COLLADA_LIBRARY)