Index: OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake
===================================================================
--- OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake (revision 9759)
+++ OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake (revision 9952)
@@ -15,4 +15,15 @@
 
 SET(COLLADA_DOM_ROOT "$ENV{COLLADA_DIR}/dom" CACHE PATH "Location of Collada DOM directory")
+
+IF(APPLE)
+    SET(COLLADA_BUILDNAME "mac")
+ELSEIF(MINGW)
+    SET(COLLADA_BUILDNAME "mingw")
+ELSEIF(MSVC90)
+    SET(COLLADA_BUILDNAME "vc9")
+ELSE(APPLE)
+    SET(COLLADA_BUILDNAME "vc8")
+ENDIF(APPLE)
+
 
 FIND_PATH(COLLADA_INCLUDE_DIR dae.h
@@ -40,6 +51,6 @@
     NAMES collada_dom collada14dom libcollada14dom21
     PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4
-    $ENV{COLLADA_DIR}/build/vc8-1.4
+    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4
+    $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4
     $ENV{COLLADA_DIR}/lib
     $ENV{COLLADA_DIR}/lib-dbg
@@ -65,6 +76,6 @@
     NAMES collada_dom-d collada14dom-d libcollada14dom21-d
     PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/build/vc8-1.4-d
+    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
+    $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4-d
     $ENV{COLLADA_DIR}/lib
     $ENV{COLLADA_DIR}/lib-dbg
@@ -90,6 +101,6 @@
     NAMES libcollada14dom21-s
     PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4
-    $ENV{COLLADA_DIR}/build/vc8-1.4
+    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4
+    $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4
     $ENV{COLLADA_DIR}/lib
     $ENV{COLLADA_DIR}/lib-dbg
@@ -115,6 +126,6 @@
     NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd
     PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/build/vc8-1.4-d
+    ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
+    $ENV{COLLADA_DIR}/build/${COLLADA_BUILDNAME}-1.4-d
     $ENV{COLLADA_DIR}/lib
     $ENV{COLLADA_DIR}/lib-dbg
@@ -174,6 +185,5 @@
             NAMES pcrecpp
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
+            ${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    
@@ -183,6 +193,5 @@
             NAMES pcrecpp-d
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
+            ${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    
@@ -192,6 +201,5 @@
             NAMES pcre
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
+            ${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    
@@ -201,6 +209,5 @@
             NAMES pcre-d
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
+            ${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
@@ -232,6 +239,5 @@
             NAMES libboost_filesystem
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
+            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
             ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
         )
@@ -240,6 +246,5 @@
             NAMES libboost_filesystem-d
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
+            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
             ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
         )
@@ -248,6 +253,5 @@
             NAMES libboost_system
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
+            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
             ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
         )
@@ -256,6 +260,5 @@
             NAMES libboost_system-d
             PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
+            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
             ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
         )