diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cc58cb..7c23908 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,12 +54,10 @@ if(${BR_DISTRIBUTED})
endif()
# Find Qt
-find_package(Qt5Concurrent)
-find_package(Qt5Core)
set(QT_DEPENDENCIES Concurrent Core)
option(BR_EMBEDDED "Limit software dependencies")
if(NOT ${BR_EMBEDDED})
- set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network OpenGL PrintSupport Sql Svg Widgets Xml)
+ set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network Sql Svg Widgets Xml)
endif()
foreach(QT_DEPENDENCY ${QT_DEPENDENCIES})
find_package(Qt5${QT_DEPENDENCY})
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 8a26e5d..3771b11 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,5 +1,7 @@
if(NOT ${BR_EMBEDDED})
find_package(Qwt REQUIRED)
+ list(REMOVE_ITEM QWT_SRC ${QWT_DIR}/src/qwt_plot_glcanvas.cpp)
+ list(REMOVE_ITEM QWT_SRC ${QWT_DIR}/src/qwt_plot_renderer.cpp)
endif()
include_directories(.)
diff --git a/sdk/openbr_export.cpp b/sdk/openbr_export.cpp
index 226096b..0c2277d 100644
--- a/sdk/openbr_export.cpp
+++ b/sdk/openbr_export.cpp
@@ -134,11 +134,14 @@ $ br -help
* $ nmake
* \endcode
* -# Start hacking OpenBR!
- * -# Download and install Qt Creator IDE.
+ * -# Download Qt Creator IDE and install.
* -# From the VS2012 x64 Cross Tools Command Prompt:
* \code
* $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe"
* \endcode
+ * -# From the Qt Creator "Tools" menu select "Options..."
+ * -# Under "Kits" select "Desktop (default)"
+ * -# For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (amd64)" and click "OK"
* -# From the Qt Creator "File" menu select "Open File or Project...".
* -# Select "C:\openbr\CMakeLists.txt" then "Open".
* -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next".
@@ -206,7 +209,7 @@ $ br -help
* $ cd C:\openbr
* $ mkdir build-mingw64
* $ cd build-mingw64
- * $ 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 ..
+ * $ 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 ..
* $ mingw32-make
* $ mingw32-make package
* \endcode
diff --git a/share/openbr/cmake/FindQwt.cmake b/share/openbr/cmake/FindQwt.cmake
index 2fd04c2..7859c34 100644
--- a/share/openbr/cmake/FindQwt.cmake
+++ b/share/openbr/cmake/FindQwt.cmake
@@ -1,4 +1,4 @@
find_path(QWT_DIR qwt.pro ${CMAKE_SOURCE_DIR}/3rdparty/*)
mark_as_advanced(QWT_DIR)
include_directories(${QWT_DIR}/src)
-aux_source_directory(${QWT_DIR}/src QWT_SRC)
+file(GLOB QWT_SRC ${QWT_DIR}/src/*.cpp)