Commit a0c203634b856863a4026f3eb3b39220da187e2a
1 parent
b945ff55
need QtGui after all
Showing
3 changed files
with
3 additions
and
8 deletions
CMakeLists.txt
| ... | ... | @@ -57,7 +57,7 @@ endif() |
| 57 | 57 | set(QT_DEPENDENCIES Concurrent Core) |
| 58 | 58 | option(BR_EMBEDDED "Limit software dependencies") |
| 59 | 59 | if(NOT ${BR_EMBEDDED}) |
| 60 | - set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network Sql Svg Widgets Xml) | |
| 60 | + set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network Sql Svg Widgets Xml) | |
| 61 | 61 | endif() |
| 62 | 62 | foreach(QT_DEPENDENCY ${QT_DEPENDENCIES}) |
| 63 | 63 | find_package(Qt5${QT_DEPENDENCY}) | ... | ... |
sdk/openbr_export.cpp
| ... | ... | @@ -108,7 +108,7 @@ $ br -help |
| 108 | 108 | * -# From the VS2012 x64 Cross Tools Command Prompt: |
| 109 | 109 | * \code |
| 110 | 110 | * $ cd qt-everywhere-opensource-src-5.0.1 |
| 111 | - * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource | |
| 111 | + * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -nomake examples -nomake tests -no-opengl -no-webkit | |
| 112 | 112 | * $ nmake |
| 113 | 113 | * $ nmake install |
| 114 | 114 | * $ cd .. |
| ... | ... | @@ -187,7 +187,7 @@ $ br -help |
| 187 | 187 | * -# From the MinGW-w64 Command Prompt: |
| 188 | 188 | * \code |
| 189 | 189 | * $ cd qt-everywhere-opensource-src-5.0.1 |
| 190 | - * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -opengl desktop | |
| 190 | + * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -nomake examples -nomake tests -no-opengl -no-webkit | |
| 191 | 191 | * $ mingw32-make |
| 192 | 192 | * $ mingw32-make install |
| 193 | 193 | * $ cd .. | ... | ... |
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -39,11 +39,6 @@ function(install_qt_library lib) |
| 39 | 39 | set(BR_INSTALL_DEPENDENCIES_SUFFIX "d") |
| 40 | 40 | endif() |
| 41 | 41 | install(FILES ${_qt5Core_install_prefix}/lib/Qt5${lib}${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) |
| 42 | - if(MSVC) | |
| 43 | - if(${lib} MATCHES OpenGL) | |
| 44 | - install(FILES ${_qt5Core_install_prefix}/lib/libGLESv2${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) | |
| 45 | - endif() | |
| 46 | - endif() | |
| 47 | 42 | elseif(CMAKE_HOST_APPLE) |
| 48 | 43 | install(DIRECTORY ${_qt5Core_install_prefix}/lib/Qt${lib}.framework DESTINATION lib) |
| 49 | 44 | else() | ... | ... |