Hi,
On our visualisation cluster, the FindCollada.cmake script shipped with
OpenSG2 doesn't seem to find all bits of collada-dom. I have tested this with
git revision 6e0d26b from today.
The attached patch uses the information from the new (I guess since collada
2.3.1) collada_dom-config.cmake to fill in the blanks.
It would be nice if this could be incorporated in the OpenSG2 git
repository...
Cheers,
Johannes
From 097ffa4991d105ff3c9cd1c3f5a947786aff7751 Mon Sep 17 00:00:00 2001
From: Johannes Zarl <johannes.z...@jku.at>
Date: Wed, 15 Feb 2012 17:23:00 +0100
Subject: [PATCH] Use info from collada_dom-config in FindCollada, when available.
---
CMake/FindCollada.cmake | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/CMake/FindCollada.cmake b/CMake/FindCollada.cmake
index 64f8d57..a48897d 100644
--- a/CMake/FindCollada.cmake
+++ b/CMake/FindCollada.cmake
@@ -17,6 +17,16 @@
# COLLADA_INCLUDE_DIR
# COLLADA_LIBRARY_DIR
+FIND_PACKAGE( COLLADA_DOM COMPONENTS 1.4 )
+IF ( COLLADA_DOM_FOUND )
+ SET( COLLADA_INCLUDE_DIRS ${COLLADA_DOM_INCLUDE_DIRS} )
+ SET( COLLADA_LIBRARIES ${COLLADA_DOM_LIBRARIES} )
+ SET( COLLADA_LIBRARY_DIRS ${COLLADA_DOM_LIBRARY_DIRS} )
+ FIND_PATH( COLLADA_DAE_INCLUDE_DIR dae.h
+ PATHS ${COLLADA_DOM_INCLUDE_DIRS} )
+ FIND_PATH(COLLADA_DOM_INCLUDE_DIR "dom/domNode.h"
+ PATHS ${COLLADA_DOM_INCLUDE_DIRS} )
+ENDIF ( COLLADA_DOM_FOUND )
# default include search paths
SET(__COLLADA_INCLUDE_SEARCH_DIRS
--
1.6.0.2
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Opensg-users mailing list
Opensg-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensg-users
