diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
| commit | d0cba9e9194841e8867afcbd02b3792b652756ab (patch) | |
| tree | 3a1016da682349dcab75b826c6a9ed002a80a6b2 /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 4fefb98cba6cdf5051bfd4d575dcccc468d77836 (diff) | |
| parent | 7a453b7c9351a743b222bbb2b94809cf7c6b3ce8 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 |
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 |