Skip to content

Update build to use OpenCV 4.9.0 #123

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

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Update build to use OpenCV 4.9.0 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbed5d1
update CMakeLists.txt to OpenCV 4.9.0
clnowacki Apr 3, 2024
7b205ac
change 4.5.0 to 4.9.0
clnowacki Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion detection/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ project(openmpf-cpp-component-api)

set(CMAKE_CXX_STANDARD 17)

find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0
COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio)


Expand Down
2 changes: 1 addition & 1 deletion detection/api/include/SeekStrategy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace MPF { namespace COMPONENT {
// frame, it uses cv::VideoCapture::grab to advance cv::VideoCapture's position.
// This means that when you need to advance 16 or fewer frames, it is more efficient to
// just use cv::VideoCapture::grab.
// https://github.com/opencv/opencv/blob/4.5.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1459
// https://github.com/opencv/opencv/blob/4.9.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1959
static constexpr int SET_POS_MIN_FRAMES = 16;
};
}}
Expand Down
2 changes: 1 addition & 1 deletion detection/examples/AudioOnlyComponent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)

find_package(mpfComponentInterface REQUIRED)
find_package(mpfDetectionComponentApi REQUIRED)
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)


set(AUDIO_ONLY_COMPONENT_SOURCES AudioOnly.cpp AudioOnly.h)
Expand Down
11 changes: 7 additions & 4 deletions detection/examples/AudioOnlyComponent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# BUILD

NOTE: To build and run this component, OpenCV 4.5.0
NOTE: To build and run this component, OpenCV 4.9.0
must be installed first.

NOTE: You must build the MPF Component API library before
building this component. See the instructions
in the README at the top-level component API
directory.

Before you build, edit the src/CMakeLists.txt file, and change
the "find_package" command so that the PATHS option specifies
the root directory of your OpenCV 4.5.0 installation.
The CMakeLists.txt file for this example is written to look for
OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local
installation is in a different location, edit the CMakeLists.txt
file in this directory to change the `find_package` command so
that the PATHS option specifies the root directory of your
OpenCV 4.9.0 installation.

Run the following commands:
```
Expand Down
2 changes: 1 addition & 1 deletion detection/examples/GenericComponent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)

find_package(mpfComponentInterface REQUIRED)
find_package(mpfDetectionComponentApi REQUIRED)
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)


set(GENERIC_COMPONENT_SOURCES GenericComponent.cpp GenericComponent.h)
Expand Down
11 changes: 7 additions & 4 deletions detection/examples/GenericComponent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# BUILD

NOTE: To build and run this component, OpenCV 4.5.0
NOTE: To build and run this component, OpenCV 4.9.0
must be installed first.

NOTE: You must build the MPF Component API library before
building this component. See the instructions
in the README at the top-level component API
directory.

Before you build, edit the src/CMakeLists.txt file, and change
the "find_package" command so that the PATHS option specifies
the root directory of your OpenCV 4.5.0 installation.
The CMakeLists.txt file for this example is written to look for
OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local
installation is in a different location, edit the CMakeLists.txt
file in this directory to change the `find_package` command so
that the PATHS option specifies the root directory of your
OpenCV 4.9.0 installation.

Run the following commands:
```
Expand Down
2 changes: 1 addition & 1 deletion detection/examples/HelloWorldComponent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)

find_package(mpfComponentInterface REQUIRED)
find_package(mpfDetectionComponentApi REQUIRED)
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)
find_package(PkgConfig)
pkg_search_module(LOG4CXX REQUIRED liblog4cxx)

Expand Down
11 changes: 7 additions & 4 deletions detection/examples/HelloWorldComponent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# BUILD

NOTE: To build and run this component, OpenCV 4.5.0
NOTE: To build and run this component, OpenCV 4.9.0
must be installed first.

NOTE: You must build the MPF Component API library before
building this component. See the instructions
in the README at the top-level component API
directory.

Before you build, edit the src/CMakeLists.txt file, and change
the "find_package" command so that the PATHS option specifies
the root directory of your OpenCV 4.5.0 installation.
The CMakeLists.txt file for this example is written to look for
OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local
installation is in a different location, edit the CMakeLists.txt
file in this directory to change the `find_package` command so
that the PATHS option specifies the root directory of your
OpenCV 4.9.0 installation.

Run the following commands:
```
Expand Down
2 changes: 1 addition & 1 deletion detection/examples/ImageTransformerComponent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)

find_package(mpfComponentInterface REQUIRED)
find_package(mpfDetectionComponentApi REQUIRED)
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core opencv_highgui)
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_highgui)


set(IMAGE_TRANSFORMER_COMPONENT_SOURCES ImageTransformerComponent.h ImageTransformerComponent.cpp)
Expand Down
11 changes: 7 additions & 4 deletions detection/examples/ImageTransformerComponent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# BUILD

NOTE: To build and run this component, OpenCV 4.5.0
NOTE: To build and run this component, OpenCV 4.9.0
must be installed first.

NOTE: You must build the MPF Component API library before
building this component. See the instructions
in the README at the top-level component API
directory.

Before you build, edit the src/CMakeLists.txt file, and change
the "find_package" command so that the PATHS option specifies
the root directory of your OpenCV 4.5.0 installation.
The CMakeLists.txt file for this example is written to look for
OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local
installation is in a different location, edit the CMakeLists.txt
file in this directory to change the `find_package` command so
that the PATHS option specifies the root directory of your
OpenCV 4.9.0 installation.

Run the following commands:
```
Expand Down
2 changes: 1 addition & 1 deletion detection/examples/VideoCaptureComponent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)

find_package(mpfComponentInterface REQUIRED)
find_package(mpfDetectionComponentApi REQUIRED)
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core opencv_highgui)
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_highgui)


set(VIDEO_CAPTURE_COMPONENT_SOURCES VideoCaptureComponent.h VideoCaptureComponent.cpp)
Expand Down
11 changes: 7 additions & 4 deletions detection/examples/VideoCaptureComponent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# BUILD

NOTE: To build and run this component, OpenCV 4.5.0 and
NOTE: To build and run this component, OpenCV 4.9.0 and
ffmpeg must be installed first.

NOTE: You must build the MPF Component API library before
building this component. See the instructions
in the README at the top-level component API
directory.

Before you build, edit the src/CMakeLists.txt file, and change
the "find_package" command so that the PATHS option specifies
the root directory of your OpenCV 4.5.0 installation.
The CMakeLists.txt file for this example is written to look for
OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local
installation is in a different location, edit the CMakeLists.txt
file in this directory to change the `find_package` command so
that the PATHS option specifies the root directory of your
OpenCV 4.9.0 installation.

Run the following commands:
```
Expand Down
2 changes: 1 addition & 1 deletion detection/testUtils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ project(openmpf-cpp-component-test-utils)

set(CMAKE_CXX_STANDARD 17)

find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0
COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio opencv_highgui)

include_directories(include)
Expand Down
2 changes: 1 addition & 1 deletion detection/utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ project(openmpf-cpp-component-utils)

set(CMAKE_CXX_STANDARD 17)

find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0
COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio)

find_package(PkgConfig)
Expand Down