summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-02-01 15:42:52 -0800
committerleyla_linden <none@none>2011-02-01 15:42:52 -0800
commit990a6206604b0a5e33902145b496f39927f6d5b9 (patch)
treec0d7561dc56b9003387554a640505af8fcc7cc51 /indra/cmake
parent1b366dfe72c5852904468aaf8ff66e8e7be88318 (diff)
parent7c5c82cb116b2dfd163055994803e07a1bfd5a8b (diff)
Merge
Diffstat (limited to 'indra/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 bb108d7dd9..34c39d36a8 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -70,6 +70,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
@@ -94,6 +95,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