From 8e959992f7588b89bbc390db3f01395dd3c1edba Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 9 Jan 2010 09:31:48 -0700
Subject: Always include VS2005 redist in copy_win_libs

---
 linden/indra/cmake/CopyWinLibs.cmake | 169 +++++++++++++++++------------------
 1 file changed, 84 insertions(+), 85 deletions(-)

(limited to 'linden/indra/cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index c051103..8767980 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -167,103 +167,102 @@ set(all_targets ${all_targets} ${out_targets})
 
 
 # Copy MS C runtime dlls, required for packaging.
+# We always need the VS 2005 redist.
 # *TODO - Adapt this to support VC9
-if (MSVC80)
-    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
-        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
+FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+    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})
+    set(debug_msvc8_files
+        msvcr80d.dll
+        msvcp80d.dll
+        Microsoft.VC80.DebugCRT.manifest
         )
 
-    if(EXISTS ${debug_msvc8_redist_path})
-        set(debug_msvc8_files
-            msvcr80d.dll
-            msvcp80d.dll
-            Microsoft.VC80.DebugCRT.manifest
-            )
+    copy_if_different(
+        ${debug_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        out_targets 
+        ${debug_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${debug_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-            out_targets 
-            ${debug_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${debug_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
+          ${debug_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+        COMMENT "Creating debug app config file"
+        )
 
-        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${debug_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
-              ${debug_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-            COMMENT "Creating debug app config file"
-            )
+endif (EXISTS ${debug_msvc8_redist_path})
 
-    endif (EXISTS ${debug_msvc8_redist_path})
+FIND_PATH(release_msvc8_redist_path msvcr80.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
 
-    FIND_PATH(release_msvc8_redist_path msvcr80.dll
-        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})
+    set(release_msvc8_files
+        msvcr80.dll
+        msvcp80.dll
+        Microsoft.VC80.CRT.manifest
         )
 
-    if(EXISTS ${release_msvc8_redist_path})
-        set(release_msvc8_files
-            msvcr80.dll
-            msvcp80.dll
-            Microsoft.VC80.CRT.manifest
-            )
-
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Release"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Release"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${release_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${release_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating release app config file"
-            )
+    set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${release_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${release_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+        COMMENT "Creating release app config file"
+        )
 
-        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${relwithdebinfo_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${relwithdebinfo_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating relwithdebinfo app config file"
-            )
-          
-    endif (EXISTS ${release_msvc8_redist_path})
-endif (MSVC80)
+    set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${relwithdebinfo_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${relwithdebinfo_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+        COMMENT "Creating relwithdebinfo app config file"
+        )
+      
+endif (EXISTS ${release_msvc8_redist_path})
 
 add_custom_target(copy_win_libs ALL
   DEPENDS 
-- 
cgit v1.1