From d490081fe29adabfd3a2dba81f5e65d90db3fb51 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 8 Apr 2011 17:12:26 -0400
Subject: changes for newer collada build

---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 indra/cmake/LLPrimitive.cmake      | 4 ++--
 indra/newview/CMakeLists.txt       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake
 mode change 100644 => 100755 indra/cmake/LLPrimitive.cmake
 mode change 100644 => 100755 indra/newview/CMakeLists.txt

(limited to 'indra')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
old mode 100644
new mode 100755
index a301a8d6ba..d4c478c3c7
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -39,7 +39,7 @@ if(WINDOWS)
         libapriconv-1.dll
         ssleay32.dll
         libeay32.dll
-        libcollada14dom21-d.dll
+        libcollada14dom22-d.dll
         glod.dll	
         )
 
@@ -51,7 +51,7 @@ if(WINDOWS)
         libapriconv-1.dll
         ssleay32.dll
         libeay32.dll
-        libcollada14dom21.dll
+        libcollada14dom22.dll
         glod.dll
         )
 
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
old mode 100644
new mode 100755
index 4bdbfe46e2..4d6a84b29e
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -14,8 +14,8 @@ if (WINDOWS)
 	set(LLPRIMITIVE_LIBRARIES 
         debug llprimitive
         optimized llprimitive
-        debug libcollada14dom21-d
-        optimized libcollada14dom21
+        debug libcollada14dom22-d
+        optimized libcollada14dom22
         debug libboost_filesystem-d
         optimized libboost_filesystem
         debug libboost_system-d
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
old mode 100644
new mode 100755
index 3ed10c08ab..d70f3ec337
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1489,9 +1489,9 @@ if (WINDOWS)
       ${SHARED_LIB_STAGING_DIR}/Release/glod.dll
       ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll
       ${SHARED_LIB_STAGING_DIR}/Debug/glod.dll
-      ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom21.dll
-      ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom21.dll
-      ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom21-d.dll
+      ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom22.dll
+      ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom22.dll
+      ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom22-d.dll
       ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
       ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll
-- 
cgit v1.2.3