Index: /OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt (revision 10234)
+++ /OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt (revision 10336)
@@ -1,7 +1,3 @@
-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
@@ -36,4 +32,6 @@
 ENDIF()
 
+ADD_DEFINITIONS(-DNO_BOOST)
+
 IF(COLLADA_USE_STATIC)
     IF(WIN32)
@@ -55,20 +53,16 @@
             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()
  
Index: /OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake
===================================================================
--- /OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake (revision 10226)
+++ /OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake (revision 10336)
@@ -127,6 +127,4 @@
     /usr/freeware/lib64
 )
-
-IF(COLLADA_STATIC_LIBRARY)
 
     # find extra libraries that the static linking requires
@@ -160,95 +158,78 @@
     ENDIF(ZLIB_FOUND)
 
-    IF(WIN32)
-
-        FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY
-            NAMES pcrecpp
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY_DEBUG 
-            NAMES pcrecpp-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRE_LIBRARY
-            NAMES pcre
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRE_LIBRARY_DEBUG 
-            NAMES pcre-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY
-            NAMES minizip
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
-        )
-
-        FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY_DEBUG
-            NAMES minizip-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
-        )
-    
-    ENDIF(WIN32)
-
-ENDIF(COLLADA_STATIC_LIBRARY)
-
-IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
-
-    IF(WIN32)
-    
-        FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
-            NAMES libboost_filesystem
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
-            NAMES libboost_filesystem-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
-            NAMES libboost_system
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
-            NAMES libboost_system-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-      FIND_PATH(COLLADA_BOOST_INCLUDE_DIR boost/filesystem/convenience.hpp
-        ${COLLADA_DOM_ROOT}/external-libs/boost
-      ) 
-
-    ENDIF(WIN32)
-
-ENDIF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
+    FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY
+        NAMES pcrecpp
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY_DEBUG
+        NAMES pcrecpp-d
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_PCRE_LIBRARY
+        NAMES pcre
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_PCRE_LIBRARY_DEBUG
+        NAMES pcre-d
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
+        ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY
+        NAMES minizip
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
+        ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
+    )
+
+    FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY_DEBUG
+        NAMES minizip-d
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
+        ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
+    )
+
+    FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
+        NAMES libboost_filesystem boost_filesystem
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
+        NAMES libboost_filesystem-d boost_filesystem-d
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
+        NAMES libboost_system boost_system
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+    )
+
+    FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
+        NAMES libboost_system-d boost_system-d
+        PATHS
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+        ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+    )
+
 
 SET(COLLADA_FOUND "NO")