Fixed CMake setting errors

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6cb44f4..6d373e7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,14 @@
 =-                        1.3.0                           -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+2009-11-15 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed CMake setting errors. 
+        
+          modified:   linden/indra/cmake/00-Common.cmake
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+
+
 2009-11-14 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Moved blog and forums menu option alerts to new notifications system.
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index afcecfc..325426e 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -33,7 +33,7 @@ if (WINDOWS)
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   if (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
       CACHE STRING "C++ compiler release options" FORCE)
   else (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 3adba60..11f70b9 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -173,6 +173,7 @@ if (MSVC80)
         PATHS
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
         NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${debug_msvc8_redist_path})
@@ -195,6 +196,7 @@ if (MSVC80)
         PATHS
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
         NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${release_msvc8_redist_path})