Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
a8fb72a8
Commit
a8fb72a8
authored
Dec 27, 2018
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed standalone FFmpeg search with pkg-config
parent
73959fed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
detect_ffmpeg.cmake
modules/videoio/cmake/detect_ffmpeg.cmake
+12
-1
No files found.
modules/videoio/cmake/detect_ffmpeg.cmake
View file @
a8fb72a8
...
...
@@ -31,6 +31,18 @@ if(NOT HAVE_FFMPEG AND PKG_CONFIG_FOUND)
if
(
FFMPEG_libavresample_FOUND
)
list
(
APPEND FFMPEG_LIBRARIES
${
FFMPEG_libavresample_LIBRARIES
}
)
endif
()
# rewrite libraries to absolute paths
foreach
(
lib
${
FFMPEG_LIBRARIES
}
)
find_library
(
FFMPEG_ABSOLUTE_
${
lib
}
"
${
lib
}
"
PATHS
"
${
FFMPEG_lib
${
lib
}
_LIBDIR
}
"
NO_DEFAULT_PATH
)
if
(
FFMPEG_ABSOLUTE_
${
lib
}
)
list
(
APPEND ffmpeg_abs_libs
"
${
FFMPEG_ABSOLUTE_
${
lib
}}
"
)
else
()
list
(
APPEND ffmpeg_abs_libs
"
${
lib
}
"
)
endif
()
endforeach
()
set
(
FFMPEG_LIBRARIES
"
${
ffmpeg_abs_libs
}
"
CACHE INTERNAL
""
FORCE
)
set
(
HAVE_FFMPEG TRUE
)
endif
()
endif
()
...
...
@@ -42,7 +54,6 @@ if(HAVE_FFMPEG AND NOT HAVE_FFMPEG_WRAPPER)
"
${
OpenCV_BINARY_DIR
}
"
"
${
OpenCV_SOURCE_DIR
}
/cmake/checks/ffmpeg_test.cpp"
CMAKE_FLAGS
"-DINCLUDE_DIRECTORIES:STRING=
${
FFMPEG_INCLUDE_DIRS
}
"
"-DLINK_DIRECTORIES:STRING=
${
FFMPEG_LIBRARY_DIRS
}
"
"-DLINK_LIBRARIES:STRING=
${
FFMPEG_LIBRARIES
}
"
OUTPUT_VARIABLE TRY_OUT
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment