Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 12:59:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6949 from birarda/installer-sixense

Browse source 
pull missing Sixense DLLs from external project
This commit is contained in:
Brad Hefta-Gaub 2016-01-27 12:17:59 -08:00
commit 5ea4cb6900
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmake/macros/GenerateInstallers.cmake
View file

@ -28,6 +28,15 @@ macro(GENERATE_INSTALLERS)
# include CMake module that will install compiler system libraries # include CMake module that will install compiler system libraries
# so that we have msvcr120 and msvcp120 installed with targets # so that we have msvcr120 and msvcp120 installed with targets
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INTERFACE_INSTALL_DIR}) 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) include(InstallRequiredSystemLibraries)
set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico") set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")