Peter M. Groen / openbr

Commit b945ff55be57408ce88420e04ea9a94e6e88646c

Authored by Josh Klontz
1 parent 64a425de

fewer Qt dependencies

Inline Side-by-side
Showing 4 changed files with 9 additions and 6 deletions
CMakeLists.txt
  View file @b945ff5
@@ -54,12 +54,10 @@ if(${BR_DISTRIBUTED}) @@ -54,12 +54,10 @@ if(${BR_DISTRIBUTED})
54 endif() 54 endif()
55 55
56 # Find Qt 56 # Find Qt
57 -find_package(Qt5Concurrent)  
58 -find_package(Qt5Core)  
59 set(QT_DEPENDENCIES Concurrent Core) 57 set(QT_DEPENDENCIES Concurrent Core)
60 option(BR_EMBEDDED "Limit software dependencies") 58 option(BR_EMBEDDED "Limit software dependencies")
61 if(NOT ${BR_EMBEDDED}) 59 if(NOT ${BR_EMBEDDED})
62 - set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network OpenGL PrintSupport Sql Svg Widgets Xml) 60 + set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network Sql Svg Widgets Xml)
63 endif() 61 endif()
64 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES}) 62 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES})
65 find_package(Qt5${QT_DEPENDENCY}) 63 find_package(Qt5${QT_DEPENDENCY})
app/CMakeLists.txt
  View file @b945ff5
1 if(NOT ${BR_EMBEDDED}) 1 if(NOT ${BR_EMBEDDED})
2 find_package(Qwt REQUIRED) 2 find_package(Qwt REQUIRED)
  3 + list(REMOVE_ITEM QWT_SRC ${QWT_DIR}/src/qwt_plot_glcanvas.cpp)
  4 + list(REMOVE_ITEM QWT_SRC ${QWT_DIR}/src/qwt_plot_renderer.cpp)
3 endif() 5 endif()
4 6
5 include_directories(.) 7 include_directories(.)
sdk/openbr_export.cpp
  View file @b945ff5
@@ -134,11 +134,14 @@ $ br -help @@ -134,11 +134,14 @@ $ br -help
134 * $ nmake 134 * $ nmake
135 * \endcode 135 * \endcode
136 * -# Start hacking OpenBR! 136 * -# Start hacking OpenBR!
137 - * -# Download and install <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Qt Creator</a> IDE. 137 + * -# Download <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Qt Creator</a> IDE and install.
138 * -# From the VS2012 x64 Cross Tools Command Prompt: 138 * -# From the VS2012 x64 Cross Tools Command Prompt:
139 * \code 139 * \code
140 * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe" 140 * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe"
141 * \endcode 141 * \endcode
  142 + * -# From the Qt Creator "Tools" menu select "Options..."
  143 + * -# Under "Kits" select "Desktop (default)"
  144 + * -# For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (amd64)" and click "OK"
142 * -# From the Qt Creator "File" menu select "Open File or Project...". 145 * -# From the Qt Creator "File" menu select "Open File or Project...".
143 * -# Select "C:\openbr\CMakeLists.txt" then "Open". 146 * -# Select "C:\openbr\CMakeLists.txt" then "Open".
144 * -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next". 147 * -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next".
@@ -206,7 +209,7 @@ $ br -help @@ -206,7 +209,7 @@ $ br -help
206 * $ cd C:\openbr 209 * $ cd C:\openbr
207 * $ mkdir build-mingw64 210 * $ mkdir build-mingw64
208 * $ cd build-mingw64 211 * $ cd build-mingw64
209 - * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install" -D QT_QMAKE_EXECUTABLE="C:/qt-everywhere-opensource-src-4.8.4/bin/qmake" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. 212 + * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release ..
210 * $ mingw32-make 213 * $ mingw32-make
211 * $ mingw32-make package 214 * $ mingw32-make package
212 * \endcode 215 * \endcode
share/openbr/cmake/FindQwt.cmake
  View file @b945ff5
1 find_path(QWT_DIR qwt.pro ${CMAKE_SOURCE_DIR}/3rdparty/*) 1 find_path(QWT_DIR qwt.pro ${CMAKE_SOURCE_DIR}/3rdparty/*)
2 mark_as_advanced(QWT_DIR) 2 mark_as_advanced(QWT_DIR)
3 include_directories(${QWT_DIR}/src) 3 include_directories(${QWT_DIR}/src)
4 -aux_source_directory(${QWT_DIR}/src QWT_SRC) 4 +file(GLOB QWT_SRC ${QWT_DIR}/src/*.cpp)