Commit 2d5cb1e4 authored by Bruno Coudoin's avatar Bruno Coudoin
Browse files

build windows, add a VCREDIST_DIR CMake var

This var must point to the dir where we can find msvcp140.dll and vcruntime140.dll
parent 16c51cbd
......@@ -232,14 +232,17 @@ if(BUILD_STANDALONE)
endif()
if(WIN32)
set(VCREDIST_DIR "" CACHE PATH "Path to vcredist dlls")
# install libEGL.dll, libGLESv2.dll, d3dcompiler_47.dll from Qt installation. Not sure if there is a clean way to get them...
# Qt5_Dir is like C:/Qt/Qt5.5.1/5.5/mingw492_32/lib/cmake/Qt5
install(FILES ${Qt5_DIR}/../../../bin/icudt54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/icuin54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/icuuc54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/libEGL.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/libGLESv2.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../../../Tools/QtCreator/bin/d3dcompiler_47.dll DESTINATION bin)
# Qt5_Dir is like C:/Qt/Qt5.5.1/5.5/mingw492_32/lib/cmake/Qt5
install(FILES ${Qt5_DIR}/../../../bin/icudt54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/icuin54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/icuuc54.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/libEGL.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/libGLESv2.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../../../Tools/QtCreator/bin/d3dcompiler_47.dll DESTINATION bin)
install(FILES ${VCREDIST_DIR}/msvcp140.dll DESTINATION bin)
install(FILES ${VCREDIST_DIR}/vcruntime140.dll DESTINATION bin)
endif()
# Packaging
......
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