Commit 870be51a authored by Jan Möbius's avatar Jan Möbius
Browse files

Moved redistributables into windows library dirs

parent e8f15c93
......@@ -183,19 +183,23 @@ if (WIN32)
# message(STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 9 2008.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2008/vcredist_x86.exe")
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2008/x32/vcredist_x86.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 10.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2010/vcredist_x86.exe")
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2010/x32/vcredist_x86.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2012/vcredist_x64.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2012/vcredist_x86.exe")
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/vcredist_x64.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32vcredist_x86.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2013/vcredist_x64.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2013/vcredist_x86.exe")
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/vcredist_x64.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/vcredist_x86.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/vcredist_x64.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/vcredist_x86.exe")
endif()
# append dll's to installed package
if (EXISTS "${REDISTRIBUTABLE_FILE}")
install (FILES "${REDISTRIBUTABLE_FILE}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment