Changeset 9952 for OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake

Timestamp:

03/23/09 17:11:41 (4 years ago)

Author:

robert

Message:

From Michael Platings, "I've changed this file so CMake automatically chooses the correct directories & libs out of vc8,vc9,mac,mingw
Tested with Visual Studio 9 2008"

Files:

• OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake (modified) (13 diffs)

OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake

@@ -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 +51 @@
     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 +76 @@
     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 +101 @@
     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 +126 @@
     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 +185 @@
             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 +193 @@
             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 +201 @@
             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 +209 @@
             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 +239 @@
             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 +246 @@
             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 +253 @@
             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 +260 @@
             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
         )