diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake index 49b10ad..824b3af 100644 --- a/cmake/Win32.cmake +++ b/cmake/Win32.cmake @@ -10,8 +10,8 @@ foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) SET(MSVC_DLL_DIR "MSVC_DLL_DIR" CACHE PATH "Where to find MSVC dlls") -INSTALL(FILES ${MSVC_DLL_DIR}/msvcr120.dll DESTINATION bin ) -INSTALL(FILES ${MSVC_DLL_DIR}/msvcp120.dll DESTINATION bin ) +#INSTALL(FILES ${MSVC_DLL_DIR}/msvcr120.dll DESTINATION bin ) +#INSTALL(FILES ${MSVC_DLL_DIR}/msvcp120.dll DESTINATION bin ) SET(QT_DIR "QT-Dir" CACHE PATH "Where to find QT Lib on Windows") SET(QT_ICU_VERSION "" CACHE STRING "Qt ICU version of dll's" ) @@ -25,15 +25,8 @@ IF( NOT USE_QT4 ) INSTALL(FILES ${QT_DIR}/bin/Qt5Core${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/Qt5Gui${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/Qt5Widgets${QT_DLL_POSTFIX}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/libGLESv2${QT_DLL_POSTFIX}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/libEGL${QT_DLL_POSTFIX}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icudt${QT_ICU_VERSION}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icuin${QT_ICU_VERSION}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icuuc${QT_ICU_VERSION}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/plugins/platforms/qminimal.dll DESTINATION bin/platforms ) - INSTALL(FILES ${QT_DIR}/plugins/platforms/qoffscreen.dll DESTINATION bin/platforms ) - INSTALL(FILES ${QT_DIR}/plugins/platforms/qwindows.dll DESTINATION bin/platforms ) - + INSTALL(FILES ${QT_DIR}/bin/Qt5PrintSupport${QT_DLL_POSTFIX}.dll DESTINATION bin ) + IF( USE_FERVOR ) INSTALL(FILES ${QT_DIR}/bin/Qt5Network${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/Qt5WebKit${QT_DLL_POSTFIX}.dll DESTINATION bin ) @@ -46,13 +39,13 @@ IF( NOT USE_QT4 ) INSTALL(FILES ${QT_DIR}/bin/Qt5Sensors${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/Qt5MultimediaWidgets${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/Qt5OpenGL${QT_DLL_POSTFIX}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/Qt5PrintSupport${QT_DLL_POSTFIX}.dll DESTINATION bin ) ENDIF() ENDIF() IF( USE_OPENCV ) SET(OpenCV_DLL_DIR "${OpenCV_DIR}/bin" CACHE PATH "Where to find OpenCV dlls") - FOREACH(opencv_module IN LISTS OPENCV_MODULES ) + SET(OpenCV_INSTALL_MODULES ${OPENCV_MODULES} CACHE STRING "List of OpenCV modules") + FOREACH(opencv_module IN LISTS OpenCV_INSTALL_MODULES ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_${opencv_module}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) ENDFOREACH() ENDIF() @@ -62,5 +55,5 @@ IF( USE_FFMPEG ) INSTALL(FILES ${FFMPEG_DIR}/bin/avcodec-${AVCODEC_VERSION}.dll DESTINATION bin ) INSTALL(FILES ${FFMPEG_DIR}/bin/avformat-${AVFORMAT_VERSION}.dll DESTINATION bin ) INSTALL(FILES ${FFMPEG_DIR}/bin/avutil-${AVUTIL_VERSION}.dll DESTINATION bin ) - INSTALL(FILES ${FFMPEG_DIR}/bin/swresample-1.dll DESTINATION bin ) + INSTALL(FILES ${FFMPEG_DIR}/bin/swresample-2.dll DESTINATION bin ) ENDIF()