Unbundle OpenCV

.travis.yml

@@ -32,9 +32,7 @@ before_install:
  - sudo tar --wildcards --strip=2 -C /usr/lib/x86_64-linux-gnu/ -xf opencv-3.4-x86_64.pkg.tar.xz usr/lib/libopencv_xfeatures2d.so* usr/lib/libopencv_xphoto.so* usr/lib/libopencv_optflow.so*
 
 script:
- - qmake -recursive PREFIX=/app
- - make
- - sudo make install
+ - qmake -recursive PREFIX=/app && make && sudo make install
 
 after_success:
  - find /app

IPL/.qmake.stash

@@ -65,3 +65,34 @@ QMAKE_DEFAULT_LIBDIRS = \
 QMAKE_MAC_SDK.macosx10.12.Path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
 QMAKE_MAC_SDK.macosx10.12.PlatformPath = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
 QMAKE_MAC_SDK.macosx10.12.SDKVersion = 10.12
+QMAKE_CXX.INCDIRS = \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 \
+    /usr/local/include \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include \
+    /usr/include \
+    "/System/Library/Frameworks (framework directory)" \
+    "/Library/Frameworks (framework directory)" \
+    /usr/include/c++/7 \
+    /usr/include/x86_64-linux-gnu/c++/7 \
+    /usr/include/c++/7/backward \
+    /usr/lib/gcc/x86_64-linux-gnu/7/include \
+    /usr/local/include \
+    /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \
+    /usr/include/x86_64-linux-gnu \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /lib \
+    /usr/lib \
+    /usr/lib/gcc/x86_64-linux-gnu/7 \
+    /usr/lib/x86_64-linux-gnu \
+    /lib/x86_64-linux-gnu
+QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION

IPL/IPL.pro

@@ -114,7 +114,6 @@ macx {
     LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_xfeatures2d.3.1.0
     LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_photo.3.1.0
     LIBS += -L$$PWD/../_lib/opencv/x64/clang/lib/ -lopencv_xphoto.3.1.0
-
 }
 
 linux {

IPL/include/IPLCameraIO.h

@@ -23,9 +23,9 @@
 #include "IPL_global.h"
 #include "IPLImage.h"
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 /**
  * @brief The IPLCameraIO class

IPL/include/IPLImage.h

@@ -31,8 +31,8 @@
 #include <stdexcept>
 
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc.hpp>
 
 /**
  * @brief The IPLImage class