From 01c91f7f1ab570d6d3060c97647882d472b14527 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 9 Jul 2014 15:17:59 +0100 Subject: [PATCH] Revert cmakelist change and add dlls to the install list --- CMakeLists.txt | 4 ++++ cmake/LibFervor.cmake | 11 +++++++++++ cmake/LibQT.cmake | 2 ++ 3 files changed, 17 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f3def4..1bfd099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,10 @@ ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HE TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib ${MODULES_LIBS} ${LINKER_LIBS} ) +IF( NOT USE_QT4 ) + QT5_USE_MODULES( ${PROJECT_NAME} ${QT_MODULES} ) +ENDIF() + INCLUDE(cmake/Install.cmake) ###################################################################################### diff --git a/cmake/LibFervor.cmake b/cmake/LibFervor.cmake index 2a315b5..8bdd1bf 100644 --- a/cmake/LibFervor.cmake +++ b/cmake/LibFervor.cmake @@ -27,8 +27,19 @@ 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 ) INSTALL(FILES ${QT_DIR}/bin/Qt5WebKitWidgets${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Quick${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Qml${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Multimedia${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Sql${QT_DLL_POSTFIX}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/Qt5Positioning${QT_DLL_POSTFIX}.dll DESTINATION bin ) + 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 ) + ENDIF() + LIST(APPEND QT_MODULES Network WebKit WebKitWidgets ) + ELSE() MESSAGE( "Fervor lib source code is not find in ${FERVOR_DIR}... Disabling it!" ) SET( USE_FERVOR False ) diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index f6264d4..99944ff 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -54,4 +54,6 @@ IF( NOT USE_QT4 ) INSTALL(FILES ${QT_DIR}/plugins/platforms/qwindows.dll DESTINATION bin/platforms ) ENDIF() + LIST(APPEND QT_MODULES Core Gui Widgets ) + ENDIF()