diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
| commit | b4c36af1419c980fd6be032b44033852d036a790 (patch) | |
| tree | c3ec2084584eec2203b6661d6cca4650b100300e /indra/cmake | |
| parent | ff0e3e6177812cdb6b3e044500d50f5d8d10434a (diff) | |
| parent | 92eadc18f3ea3538c36518f7060b4b78a80bc0d7 (diff) | |
merge changes for storm-547
Diffstat (limited to 'indra/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 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 |