Commit 8d262f9d authored by Jan Möbius's avatar Jan Möbius

Added correct paths for vs2012 redists

Make installer call the redist on installation



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16955 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d59a1b5c
......@@ -183,9 +183,9 @@ if (WIN32)
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 10.*" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2010/vcredist_x86.exe")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/WIN/DLLs/Redistributables/Visual Studio 2012/vcredist_x64.exe")
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/DLLs/Redistributables/Visual Studio 2012/vcredist_x86.exe")
SET(REDISTRIBUTABLE_FILE "${CMAKE_SOURCE_DIR}/win/VS2012/vcredist_x86.exe")
endif()
# append dll's to installed package
......@@ -193,10 +193,17 @@ if (WIN32)
install (FILES "${REDISTRIBUTABLE_FILE}"
DESTINATION ${ACG_PROJECT_BINDIR}
)
set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q /norestart'")
message(STATUS "Using Redistributable found here: ${REDISTRIBUTABLE_FILE}")
if ( CMAKE_GENERATOR MATCHES "^.*Win64" )
set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x64.exe\\\" /q /norestart'")
message(STATUS "Using Redistributable found here: ${REDISTRIBUTABLE_FILE}")
else()
set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q /norestart'")
message(STATUS "Using Redistributable found here: ${REDISTRIBUTABLE_FILE}")
endif()
else()
message(WARNING "Warning: No vcredist_x86 found (Only required for creating installer package). Please copy it to a directory called win in your source tree: ${REDISTRIBUTABLE_FILE}")
message(WARNING "Warning: No vcredist_x86 or vcredist_x64 found (Only required for creating installer package). Please copy it to a directory called win in your source tree: ${REDISTRIBUTABLE_FILE}")
endif ()
......
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