diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
commit | c44e7128212c52e8fb67a2573db4021ba400b32c (patch) | |
tree | aa6c1d0f0786a37ec08ece818df23122ac0c4c60 /indra/cmake | |
parent | ec0eafbaa0e4c4fbf25bab31ed38d90e998e9dbd (diff) | |
parent | a98b7003043c49bd687356843f3740f0a50ab258 (diff) |
merge changes for storm-348
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 |