From e6a8fd192cf46ba800478c35bba61bce53923283 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 26 Jan 2016 15:54:08 -0800 Subject: [PATCH] use the VS2011 DLLs bundled with sixense for installer --- cmake/macros/GenerateInstallers.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index e0523f32d3..b4744aa172 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -28,6 +28,15 @@ macro(GENERATE_INSTALLERS) # include CMake module that will install compiler system libraries # so that we have msvcr120 and msvcp120 installed with targets set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INTERFACE_INSTALL_DIR}) + + # as long as we're including sixense plugin with installer + # we need re-distributables for VS 2011 as well + # this should be removed if/when sixense support is pulled + set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS + "${EXTERNALS_BINARY_DIR}/sixense/project/src/sixense/samples/win64/msvcr100.dll" + "${EXTERNALS_BINARY_DIR}/sixense/project/src/sixense/samples/win64/msvcp100.dll" + ) + include(InstallRequiredSystemLibraries) set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")