diff options
| author | Ima Mechanique <none@none> | 2011-04-21 22:11:48 +0100 |
|---|---|---|
| committer | Ima Mechanique <none@none> | 2011-04-21 22:11:48 +0100 |
| commit | 4906f4644f7b8e8348f67ea7fde0909f58338ff1 (patch) | |
| tree | bb88af451b6bbf564c188259c2c1755313fbf6dd | |
| parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
OPEN-61 Adding locations that redistributable package installs msvc* files.
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 2e6b01abc2..ed42e8fe5a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -361,6 +361,8 @@ Ian Kas [NO JIRA] (Ukranian localization) CT-322 CT-325 +Ima Mechanique + OPEN-61 Irene Muni CT-324 CT-352 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 1c43c4ce12..4202b54f94 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -127,7 +127,8 @@ elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010 PATHS ${MSVC_DEBUG_REDIST_PATH} [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT - NO_DEFAULT_PATH + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64 + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32 NO_DEFAULT_PATH ) @@ -151,7 +152,8 @@ elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010 PATHS ${MSVC_REDIST_PATH} [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT - NO_DEFAULT_PATH + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64 + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32 NO_DEFAULT_PATH ) |