diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c23908..9886575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ endif() set(QT_DEPENDENCIES Concurrent Core) option(BR_EMBEDDED "Limit software dependencies") if(NOT ${BR_EMBEDDED}) - set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network Sql Svg Widgets Xml) + set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network Sql Svg Widgets Xml) endif() foreach(QT_DEPENDENCY ${QT_DEPENDENCIES}) find_package(Qt5${QT_DEPENDENCY}) diff --git a/sdk/openbr_export.cpp b/sdk/openbr_export.cpp index 0c2277d..869d17e 100644 --- a/sdk/openbr_export.cpp +++ b/sdk/openbr_export.cpp @@ -108,7 +108,7 @@ $ br -help * -# From the VS2012 x64 Cross Tools Command Prompt: * \code * $ cd qt-everywhere-opensource-src-5.0.1 - * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource + * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -nomake examples -nomake tests -no-opengl -no-webkit * $ nmake * $ nmake install * $ cd .. @@ -187,7 +187,7 @@ $ br -help * -# From the MinGW-w64 Command Prompt: * \code * $ cd qt-everywhere-opensource-src-5.0.1 - * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -opengl desktop + * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -nomake examples -nomake tests -no-opengl -no-webkit * $ mingw32-make * $ mingw32-make install * $ cd .. diff --git a/share/openbr/cmake/InstallDependencies.cmake b/share/openbr/cmake/InstallDependencies.cmake index b716259..56edc23 100644 --- a/share/openbr/cmake/InstallDependencies.cmake +++ b/share/openbr/cmake/InstallDependencies.cmake @@ -39,11 +39,6 @@ function(install_qt_library lib) set(BR_INSTALL_DEPENDENCIES_SUFFIX "d") endif() install(FILES ${_qt5Core_install_prefix}/lib/Qt5${lib}${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) - if(MSVC) - if(${lib} MATCHES OpenGL) - install(FILES ${_qt5Core_install_prefix}/lib/libGLESv2${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) - endif() - endif() elseif(CMAKE_HOST_APPLE) install(DIRECTORY ${_qt5Core_install_prefix}/lib/Qt${lib}.framework DESTINATION lib) else()