Skip to content

Commit 7b883ef

Browse files
authored
Merge pull request #587 from dstoup/opencv-depends-qt-not-default
Break the forced dependency of Qt on OpenCV.
2 parents bfd9654 + 8cafadf commit 7b883ef

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

CMake/External_OpenCV.cmake

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,21 @@ if(fletch_BUILD_WITH_PYTHON)
219219
message(STATUS "Configuring OpenCV Python : ${OpenCV_PYTHON_FLAGS}")
220220
endif()
221221

222-
# Qt
223-
add_package_dependency(
224-
PACKAGE OpenCV
225-
PACKAGE_DEPENDENCY Qt
226-
PACKAGE_DEPENDENCY_ALIAS Qt4
227-
OPTIONAL
228-
)
229-
230222
if ( fletch_ENABLE_Qt )
231-
option(fletch_ENABLE_OpenCV_Qt "Build OpenCV with FFMPEG support" TRUE )
223+
option(fletch_ENABLE_OpenCV_Qt "Build OpenCV with FFMPEG support" FALSE )
232224
mark_as_advanced(fletch_ENABLE_OpenCV_Qt)
233225
else()
234226
unset(fletch_ENABLE_OpenCV_Qt CACHE)
235227
endif()
236228

237229
if (fletch_ENABLE_OpenCV_Qt)
230+
# Qt
231+
add_package_dependency(
232+
PACKAGE OpenCV
233+
PACKAGE_DEPENDENCY Qt
234+
PACKAGE_DEPENDENCY_ALIAS Qt4
235+
OPTIONAL
236+
)
238237
if (Qt_version VERSION_LESS 5.0.0)
239238
list(APPEND OpenCV_EXTRA_BUILD_FLAGS
240239
-DWITH_QT:BOOL=4

0 commit comments

Comments
 (0)