summaryrefslogtreecommitdiff
path: root/indra/cmake/Copy3rdPartyLibs.cmake
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
commit52ae219d502d182a7e6c000070e5935b923f30e7 (patch)
tree556151d5097feb5ae079786044188cb0d0400d16 /indra/cmake/Copy3rdPartyLibs.cmake
parent1c8c28a8de73228c06fdf2d84045433c7231cd19 (diff)
parent609c70eb5a48389bef1ad33358774764ee9615e2 (diff)
Merge again lindenlab/viewer-development
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 176ae9787e..1b08c3fd2e 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -66,6 +66,7 @@ if(WINDOWS)
if (MSVC80)
FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
PATHS
+ ${MSVC_DEBUG_REDIST_PATH}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH
@@ -90,6 +91,7 @@ if (MSVC80)
FIND_PATH(release_msvc8_redist_path msvcr80.dll
PATHS
+ ${MSVC_REDIST_PATH}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH