Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
06fe038d
Commit
06fe038d
authored
Feb 08, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: Properly link to swscale.
parent
acb74148
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
extras/buildsystem/cmake/include/FindFFmpeg.cmake
extras/buildsystem/cmake/include/FindFFmpeg.cmake
+1
-1
extras/buildsystem/cmake/include/config.cmake
extras/buildsystem/cmake/include/config.cmake
+5
-1
No files found.
extras/buildsystem/cmake/include/FindFFmpeg.cmake
View file @
06fe038d
...
@@ -16,7 +16,7 @@ if (NOT FFmpeg_SEARCHED)
...
@@ -16,7 +16,7 @@ if (NOT FFmpeg_SEARCHED)
if
(
NOT FFmpeg_FOUND
)
if
(
NOT FFmpeg_FOUND
)
set
(
FFmpeg_LIBRARIES
""
)
set
(
FFmpeg_LIBRARIES
""
)
foreach
(
library ffmpeg avcodec avformat avutil postproc
)
foreach
(
library ffmpeg avcodec avformat avutil postproc
swscale
)
find_library
(
${
library
}
_LIBRARY
${
library
}
)
find_library
(
${
library
}
_LIBRARY
${
library
}
)
set
(
${
library
}
_LIBRARY_FOUND NOT
${${
library
}
_LIBRARY
}
)
set
(
${
library
}
_LIBRARY_FOUND NOT
${${
library
}
_LIBRARY
}
)
if
(
${
library
}
_LIBRARY_FOUND
)
if
(
${
library
}
_LIBRARY_FOUND
)
...
...
extras/buildsystem/cmake/include/config.cmake
View file @
06fe038d
...
@@ -196,7 +196,9 @@ if(APPLE)
...
@@ -196,7 +196,9 @@ if(APPLE)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/vlc_find_frameworks.cmake
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/vlc_find_frameworks.cmake
)
if
(
ENABLE_NO_SYMBOL_CHECK
)
if
(
ENABLE_NO_SYMBOL_CHECK
)
set
(
DYNAMIC_LOOKUP
"-undefined dynamic_lookup"
CACHE INTERNAL STRING
)
set
(
DYNAMIC_LOOKUP
"-undefined dynamic_lookup"
)
else
(
ENABLE_NO_SYMBOL_CHECK
)
set
(
DYNAMIC_LOOKUP
)
endif
(
ENABLE_NO_SYMBOL_CHECK
)
endif
(
ENABLE_NO_SYMBOL_CHECK
)
set
(
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
set
(
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
"
${
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
}
${
DYNAMIC_LOOKUP
}
"
)
"
${
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
}
${
DYNAMIC_LOOKUP
}
"
)
...
@@ -371,6 +373,8 @@ find_package(FFmpeg)
...
@@ -371,6 +373,8 @@ find_package(FFmpeg)
if
(
FFmpeg_FOUND
)
if
(
FFmpeg_FOUND
)
set
(
CMAKE_EXTRA_INCLUDE_FILES stdint.h
)
set
(
CMAKE_EXTRA_INCLUDE_FILES stdint.h
)
vlc_check_include_files
(
ffmpeg/avcodec.h
)
vlc_check_include_files
(
ffmpeg/avcodec.h
)
vlc_check_include_files
(
ffmpeg/avutil.h
)
vlc_check_include_files
(
ffmpeg/swscale.h
)
vlc_check_include_files
(
postproc/postprocess.h
)
vlc_check_include_files
(
postproc/postprocess.h
)
set
(
CMAKE_EXTRA_INCLUDE_FILES
)
set
(
CMAKE_EXTRA_INCLUDE_FILES
)
vlc_enable_modules
(
ffmpeg
)
vlc_enable_modules
(
ffmpeg
)
...
...
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