Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Opencv2 #38

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Opencv2 #38

wants to merge 4 commits into from

Conversation

eleaver
Copy link
Contributor

@eleaver eleaver commented Jun 26, 2022

  1. Update Ace, Rx, ad WangBovik plugins from opencv to opencv2. This involved only pulling in FindOpenCv.cmake from Opticks, and changing "include <opencv/cv.h>" to "#include <opencv2/opencv.hpp>" in the source files.
  2. Remove qmake queries from ConfigureQt5Qwt6.cmake, now getting all needed Qt info from ${Qt5_DIR}/Qt5Config.cmake as now does Opticks. This simplification might affect Windows builds, which should be tested.
  3. Change Ossim to an optional dependency.
  4. Copy in the FindOssim.cmake, Findproj.cmake, Findgeotiff.cmake, and Findtiff.cmake from Opticks for consistency.

Build testing will also need be done on Windows.

ConfigureSpectral.sh.txt

@eleaver
1. Convert all #include <opencv/cv.h> to #include <opencv2/opencv.hpp…
e486a11 
…> so that Spectral and Opticks use the same opencv2 libraries.

git tag opencv2-1
@eleaver
1. Update Ace, Rx, and WangBovik to include opencv2 headers rather t…
8eda868 
…han older opencv. No other changes, just the #includes.

   2. Code/CMakeLists.txt make Ossim an optional package -- it doesn't ever seem to be used.
   3. Code/cmake/Modules/ConfigureQt5Qwt6.cmake simplify Qt5 package determination usingQt5_DIR variable consistent with Opticks' ConfigureQt5Qwt5.
   4. Code/cmake/Modules/FindQwt6ForQt5.cmake similar as ConfigureQt5Qwt6.cmake except spectral uses qwt6 which must always be
      compiled and installed separately on CentOS-7.
   5. Code/cmake/Modules/FindOpenCv.cmake, FindOssim, and Findproj are copied over from opticks for consistency.
   git tag opencv2-2
@eleaver
Add cmake_policy(SET CMP0075 NEW) to stiffle complaints on CentOS-7
3489f84 
cmake 3.17.5
git tag opencv2-3
@eleaver
Very minor updates to FindOssim.cmake, Findgeotiff.cmake, and Findgeo…
46de992 
…tiff.cmake to make them identical with those in Opticks.

git tag opencv2-4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@eleaver