From Roger James and Robert Osfield, clean up of COLLADA CMake support

src/osgPlugins/dae/CMakeLists.txt

@@ -1,8 +1,4 @@
-IF (WIN32)
-    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} )
-ELSE ()
-    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
-ENDIF ()
+INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
 
 SET(TARGET_SRC
     daeReader.cpp
@@ -35,6 +31,8 @@ ELSE()
     SET(COLLADA_USE_STATIC "NO")
 ENDIF()
 
+ADD_DEFINITIONS(-DNO_BOOST)
+
 IF(COLLADA_USE_STATIC)
     IF(WIN32)
         ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
@@ -54,22 +52,18 @@ IF(COLLADA_USE_STATIC)
             COLLADA_PCRECPP_LIBRARY
             COLLADA_PCRE_LIBRARY
             COLLADA_BOOST_FILESYSTEM_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)    
+            COLLADA_BOOST_SYSTEM_LIBRARY)
     ENDIF()
 ELSE()
     IF(WIN32)
-        ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB)
-        SET(TARGET_LIBRARIES_VARS
-            COLLADA_DYNAMIC_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)
+        ADD_DEFINITIONS(-DDOM_DYNAMIC)
+        SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY)
     ELSE()
         SET(TARGET_LIBRARIES_VARS
-            COLLADA_PCRECPP_LIBRARY
-            COLLADA_PCRE_LIBRARY
-            COLLADA_DYNAMIC_LIBRARY
-            COLLADA_BOOST_FILESYSTEM_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)
-    ENDIF() 
+                    COLLADA_DYNAMIC_LIBRARY
+                    COLLADA_BOOST_FILESYSTEM_LIBRARY)
+    ENDIF()
+
 ENDIF()
  
 SET(TARGET_ADDED_LIBRARIES osgSim )