1 files changed, 34 insertions, 30 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 92b5d71..b1291df 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -18,7 +18,6 @@ set(vivox_files
 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
     freebl3.dll
-    gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
@@ -53,7 +52,6 @@ set(all_targets ${all_targets} ${out_targets})
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
     freebl3.dll
-    gksvggdiplus.dll
     js3250.dll
     nspr4.dll
     nss3.dll
@@ -112,34 +110,38 @@ if(EXISTS ${internal_llkdu_path})
         )
     set(all_targets ${all_targets} ${llkdu_dst})
 else(EXISTS ${internal_llkdu_path})
-    set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
-    set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${debug_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
-        DEPENDS ${debug_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
-        )
-    set(all_targets ${all_targets} ${debug_llkdu_dst})
-
-    set(release_llkdu_src "${release_src_dir}/llkdu.dll")
-    set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${release_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
-        )
-    set(all_targets ${all_targets} ${release_llkdu_dst})
-
-    set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${relwithdebinfo_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-        )
-    set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
+    if (EXISTS "${debug_src_dir}/llkdu.dll")
+        set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
+        set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
+        ADD_CUSTOM_COMMAND(
+            OUTPUT  ${debug_llkdu_dst}
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
+            DEPENDS ${debug_llkdu_src}
+            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
+            )
+        set(all_targets ${all_targets} ${debug_llkdu_dst})
+    endif (EXISTS "${debug_src_dir}/llkdu.dll")
+
+    if (EXISTS "${release_src_dir}/llkdu.dll")
+        set(release_llkdu_src "${release_src_dir}/llkdu.dll")
+        set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
+        ADD_CUSTOM_COMMAND(
+            OUTPUT  ${release_llkdu_dst}
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
+            DEPENDS ${release_llkdu_src}
+            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
+            )
+        set(all_targets ${all_targets} ${release_llkdu_dst})
+
+        set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
+        ADD_CUSTOM_COMMAND(
+            OUTPUT  ${relwithdebinfo_llkdu_dst}
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
+            DEPENDS ${release_llkdu_src}
+            COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+            )
+        set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
+    endif (EXISTS "${release_src_dir}/llkdu.dll")
    
 endif (EXISTS ${internal_llkdu_path})
 
@@ -150,6 +152,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})
@@ -172,6 +175,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})