fixed: windows build errors (collada)

: gen doc targets only if DOXYGEN_EXECUTABLE is found git-svn-id: https://opensg.vrsource.org/svn/trunk@2264 4683daeb-ad0f-0410-a623-93161e962ae5
vossg · Jan 4, 2010 · 7be82d7 · 7be82d7
1 parent 188aa42
commit 7be82d7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -722,12 +722,14 @@ IF(OSG_DOXY_INPUTS)
                 "@INCLUDE = ${OSG_DOXY_INPUTS}\n")
 ENDIF(OSG_DOXY_INPUTS)
 
-ADD_CUSTOM_TARGET(DocSyncGV 
-                  COMMAND rsync html -av --delete html rsync://tombstone.camtech.ntu.edu.sg/opensgdoc
-                  WORKING_DIRECTORY Doc)
+IF(DOXYGEN_EXECUTABLE)
+  ADD_CUSTOM_TARGET(DocSyncGV 
+                    COMMAND rsync html -av --delete html rsync://tombstone.camtech.ntu.edu.sg/opensgdoc
+                    WORKING_DIRECTORY Doc)
 
-ADD_CUSTOM_TARGET(DocCompleteGV)
-ADD_DEPENDENCIES(DocCompleteGV Doc DocSyncGV)
+  ADD_CUSTOM_TARGET(DocCompleteGV)
+  ADD_DEPENDENCIES(DocCompleteGV Doc DocSyncGV)
+ENDIF(DOXYGEN_EXECUTABLE)
 
 
 ###############
@@ -861,9 +863,11 @@ IF(OSG_DOXY_STDOUT_LOG)
     SET(OSG_DOC_PIPES > ${OSG_DOXY_STDOUT_LOG})
 ENDIF(OSG_DOXY_STDOUT_LOG)
 
-ADD_CUSTOM_TARGET(Doc 
-                  VERBATIM
-                  COMMAND ${DOXYGEN_EXECUTABLE} ${OSG_DOXY_CONFIGURATION_FILE} ${OSG_DOC_PIPES})
+IF(DOXYGEN_EXECUTABLE)
+  ADD_CUSTOM_TARGET(Doc 
+                    VERBATIM
+                    COMMAND ${DOXYGEN_EXECUTABLE} ${OSG_DOXY_CONFIGURATION_FILE} ${OSG_DOC_PIPES})
+ENDIF(DOXYGEN_EXECUTABLE)
 
 ##################
 # osg2-config

diff --git a/Source/System/FileIO/Collada/OSGColladaElement.h b/Source/System/FileIO/Collada/OSGColladaElement.h
@@ -123,6 +123,7 @@ OSG_GEN_MEMOBJPTR(ColladaElement);
 OSG_END_NAMESPACE
 
 #include "OSGColladaElement.inl"
+#include "OSGColladaGlobal.h"
 
 #endif // OSG_WITH_COLLADA
 

diff --git a/Source/System/FileIO/Collada/OSGColladaGeometry.h b/Source/System/FileIO/Collada/OSGColladaGeometry.h
@@ -46,6 +46,7 @@
 #include "OSGColladaInstantiableElement.h"
 #include "OSGColladaElementFactoryHelper.h"
 #include "OSGColladaInstanceMaterial.h"
+#include "OSGColladaSource.h"
 #include "OSGNode.h"
 #include "OSGGeometry.h"
 #include "OSGGeoVectorProperty.h"
@@ -69,8 +70,6 @@ class domTristrips;
 OSG_BEGIN_NAMESPACE
 
 // forward decls
-class ColladaSource;
-OSG_GEN_MEMOBJPTR(ColladaSource);
 class ColladaInstanceGeometry;
 OSG_GEN_MEMOBJPTR(ColladaInstanceGeometry);
 

diff --git a/Source/System/FileIO/Collada/OSGColladaScene.h b/Source/System/FileIO/Collada/OSGColladaScene.h
@@ -111,6 +111,7 @@ OSG_GEN_MEMOBJPTR(ColladaScene);
 OSG_END_NAMESPACE
 
 // #include "OSGColladaScene.inl"
+#include "OSGColladaInstanceVisualScene.h"
 
 #endif // OSG_WITH_COLLADA