Skip to content
Snippets Groups Projects
Commit 3aeb346b authored by simon's avatar simon
Browse files

Merge fix for MAINT-5277 into experience tools branch

parents 30d35f5c c76e983b
No related branches found
No related tags found
No related merge requests found
...@@ -70,76 +70,87 @@ if(WINDOWS) ...@@ -70,76 +70,87 @@ if(WINDOWS)
# Copy MS C runtime dlls, required for packaging. # Copy MS C runtime dlls, required for packaging.
# *TODO - Adapt this to support VC9 # *TODO - Adapt this to support VC9
if (MSVC80) if (MSVC80)
set(MSVC_VER 80) list(APPEND LMSVC_VER 80)
set(MSVC_VERDOT 8.0) list(APPEND LMSVC_VERDOT 8.0)
elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010 elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010
set(MSVC_VER 100) MESSAGE(STATUS "MSVC_VERSION ${MSVC_VERSION}")
set(MSVC_VERDOT 10.0)
elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12 elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12
set(MSVC_VER 120) list(APPEND LMSVC_VER 120)
set(MSVC_VERDOT 12.0) list(APPEND LMSVC_VERDOT 12.0)
else (MSVC80) else (MSVC80)
MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake") MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
endif (MSVC80) endif (MSVC80)
FIND_PATH(debug_msvc_redist_path msvcr${MSVC_VER}d.dll # try to copy VS2010 redist independently of system version
PATHS list(APPEND LMSVC_VER 100)
${MSVC_DEBUG_REDIST_PATH} list(APPEND LMSVC_VERDOT 10.0)
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_VERDOT}\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC${MSVC_VER}.DebugCRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64 list(LENGTH LMSVC_VER count)
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32 math(EXPR count "${count}-1")
NO_DEFAULT_PATH foreach(i RANGE ${count})
) list(GET LMSVC_VER ${i} MSVC_VER)
list(GET LMSVC_VERDOT ${i} MSVC_VERDOT)
if(EXISTS ${debug_msvc_redist_path}) MESSAGE(STATUS "Copying redist libs for VC ${MSVC_VERDOT}")
set(debug_msvc_files FIND_PATH(debug_msvc_redist_path NAME msvcr${MSVC_VER}d.dll
msvcr${MSVC_VER}d.dll PATHS
msvcp${MSVC_VER}d.dll [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_VERDOT}\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC${MSVC_VER}.DebugCRT
) [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
copy_if_different( ${MSVC_DEBUG_REDIST_PATH}
${debug_msvc_redist_path} NO_DEFAULT_PATH
"${SHARED_LIB_STAGING_DIR_DEBUG}"
out_targets
${debug_msvc_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
endif ()
FIND_PATH(release_msvc_redist_path msvcr${MSVC_VER}.dll
PATHS
${MSVC_REDIST_PATH}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_VERDOT}\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC${MSVC_VER}.CRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
NO_DEFAULT_PATH
)
if(EXISTS ${release_msvc_redist_path})
set(release_msvc_files
msvcr${MSVC_VER}.dll
msvcp${MSVC_VER}.dll
)
copy_if_different(
${release_msvc_redist_path}
"${SHARED_LIB_STAGING_DIR_RELEASE}"
out_targets
${release_msvc_files}
) )
set(third_party_targets ${third_party_targets} ${out_targets})
copy_if_different( if(EXISTS ${debug_msvc_redist_path})
${release_msvc_redist_path} set(debug_msvc_files
"${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}" msvcr${MSVC_VER}d.dll
out_targets msvcp${MSVC_VER}d.dll
${release_msvc_files} )
copy_if_different(
${debug_msvc_redist_path}
"${SHARED_LIB_STAGING_DIR_DEBUG}"
out_targets
${debug_msvc_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
unset(debug_msvc_redist_path CACHE)
endif()
FIND_PATH(release_msvc_redist_path NAME msvcr${MSVC_VER}.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_VERDOT}\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC${MSVC_VER}.CRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
${MSVC_REDIST_PATH}
NO_DEFAULT_PATH
) )
set(third_party_targets ${third_party_targets} ${out_targets})
endif ()
if(EXISTS ${release_msvc_redist_path})
set(release_msvc_files
msvcr${MSVC_VER}.dll
msvcp${MSVC_VER}.dll
)
copy_if_different(
${release_msvc_redist_path}
"${SHARED_LIB_STAGING_DIR_RELEASE}"
out_targets
${release_msvc_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
copy_if_different(
${release_msvc_redist_path}
"${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
out_targets
${release_msvc_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
unset(release_msvc_redist_path CACHE)
endif()
endforeach()
elseif(DARWIN) elseif(DARWIN)
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources") set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
......
...@@ -387,9 +387,13 @@ class Windows_i686_Manifest(ViewerManifest): ...@@ -387,9 +387,13 @@ class Windows_i686_Manifest(ViewerManifest):
if self.args['configuration'].lower() == 'debug': if self.args['configuration'].lower() == 'debug':
self.path("msvcr120d.dll") self.path("msvcr120d.dll")
self.path("msvcp120d.dll") self.path("msvcp120d.dll")
self.path("msvcr100d.dll")
self.path("msvcp100d.dll")
else: else:
self.path("msvcr120.dll") self.path("msvcr120.dll")
self.path("msvcp120.dll") self.path("msvcp120.dll")
self.path("msvcr100.dll")
self.path("msvcp100.dll")
# Vivox runtimes # Vivox runtimes
self.path("SLVoice.exe") self.path("SLVoice.exe")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment