Skip to content

Commit e152706

Browse files
clnowackiclnowacki
authored
Update build to use OpenCV 4.9.0 (#123)
1 parent 8b69850 commit e152706

14 files changed

Lines changed: 44 additions & 29 deletions

File tree

‎detection/api/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ project(openmpf-cpp-component-api)
3030

3131
set(CMAKE_CXX_STANDARD 17)
3232

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

3636

‎detection/api/include/SeekStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ namespace MPF { namespace COMPONENT {
9393
// frame, it uses cv::VideoCapture::grab to advance cv::VideoCapture's position.
9494
// This means that when you need to advance 16 or fewer frames, it is more efficient to
9595
// just use cv::VideoCapture::grab.
96-
// https://github.com/opencv/opencv/blob/4.5.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1459
96+
// https://github.com/opencv/opencv/blob/4.9.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1959
9797
static constexpr int SET_POS_MIN_FRAMES = 16;
9898
};
9999
}}

‎detection/examples/AudioOnlyComponent/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
3434

3535
find_package(mpfComponentInterface REQUIRED)
3636
find_package(mpfDetectionComponentApi REQUIRED)
37-
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
37+
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)
3838

3939

4040
set(AUDIO_ONLY_COMPONENT_SOURCES AudioOnly.cpp AudioOnly.h)

‎detection/examples/AudioOnlyComponent/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# BUILD
22

3-
NOTE: To build and run this component, OpenCV 4.5.0
3+
NOTE: To build and run this component, OpenCV 4.9.0
44
must be installed first.
55

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

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

1518
Run the following commands:
1619
```

‎detection/examples/GenericComponent/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
3434

3535
find_package(mpfComponentInterface REQUIRED)
3636
find_package(mpfDetectionComponentApi REQUIRED)
37-
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
37+
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)
3838

3939

4040
set(GENERIC_COMPONENT_SOURCES GenericComponent.cpp GenericComponent.h)

‎detection/examples/GenericComponent/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# BUILD
22

3-
NOTE: To build and run this component, OpenCV 4.5.0
3+
NOTE: To build and run this component, OpenCV 4.9.0
44
must be installed first.
55

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

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

1518
Run the following commands:
1619
```

‎detection/examples/HelloWorldComponent/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
3434

3535
find_package(mpfComponentInterface REQUIRED)
3636
find_package(mpfDetectionComponentApi REQUIRED)
37-
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core)
37+
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core)
3838
find_package(PkgConfig)
3939
pkg_search_module(LOG4CXX REQUIRED liblog4cxx)
4040

‎detection/examples/HelloWorldComponent/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# BUILD
22

3-
NOTE: To build and run this component, OpenCV 4.5.0
3+
NOTE: To build and run this component, OpenCV 4.9.0
44
must be installed first.
55

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

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

1518
Run the following commands:
1619
```

‎detection/examples/ImageTransformerComponent/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include(../ComponentSetup.cmake)
3434

3535
find_package(mpfComponentInterface REQUIRED)
3636
find_package(mpfDetectionComponentApi REQUIRED)
37-
find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core opencv_highgui)
37+
find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_highgui)
3838

3939

4040
set(IMAGE_TRANSFORMER_COMPONENT_SOURCES ImageTransformerComponent.h ImageTransformerComponent.cpp)

‎detection/examples/ImageTransformerComponent/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# BUILD
22

3-
NOTE: To build and run this component, OpenCV 4.5.0
3+
NOTE: To build and run this component, OpenCV 4.9.0
44
must be installed first.
55

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

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

1518
Run the following commands:
1619
```

0 commit comments

Comments
 (0)