Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
81472e42
Commit
81472e42
authored
Feb 27, 2008
by
Faustino Osuna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: Source code clean up, fix how CFLAGS are saved, and compensate for latest changes in ffmpeg.
parent
5458d5a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
19 deletions
+26
-19
extras/buildsystem/cmake/include/FindFFmpeg.cmake
extras/buildsystem/cmake/include/FindFFmpeg.cmake
+19
-14
extras/buildsystem/cmake/include/config.cmake
extras/buildsystem/cmake/include/config.cmake
+7
-5
No files found.
extras/buildsystem/cmake/include/FindFFmpeg.cmake
View file @
81472e42
...
...
@@ -5,7 +5,6 @@
# FFmpeg_LIBRARIES - Link these to use FFmpeg.
# FFmpeg_CFLAGS - Link these to use FFmpeg.
if
(
NOT FFmpeg_SEARCHED
)
include
(
CheckLibraryExists
)
...
...
@@ -19,31 +18,37 @@ if (NOT FFmpeg_SEARCHED)
foreach
(
library ffmpeg avcodec avformat avutil postproc swscale
)
find_library
(
${
library
}
_LIBRARY
${
library
}
)
if
(
${
library
}
_LIBRARY
)
pkg_check_modules
(
${
library
}
_LIBRARY lib
${
library
}
)
set
(
FFmpeg_CFLAGS
"
${
FFmpeg_CFLAGS
}
${${
library
}
_LIBRARY_CFLAGS
}
"
)
set
(
FFmpeg_LIBRARIES
"
${
library
}
;
${
FFmpeg_LIBRARIES
}
"
)
set
(
FFmpeg_FOUND TRUE CACHE INTERNAL
""
)
pkg_check_modules
(
${
library
}
_LIBRARY lib
${
library
}
)
set
(
FFmpeg_LIBRARIES
"
${
library
}
;
${
FFmpeg_LIBRARIES
}
"
)
if
(
${
library
}
_LIBRARY_CFLAGS
)
set
(
FFmpeg_CFLAGS
${
FFmpeg_CFLAGS
}
${${
library
}
_LIBRARY_CFLAGS
}
)
endif
(
${
library
}
_LIBRARY_CFLAGS
)
set
(
FFmpeg_FOUND TRUE CACHE INTERNAL
""
)
endif
(
${
library
}
_LIBRARY
)
endforeach
(
library
)
foreach
(
library a52 faac lame z png mp3lame twolame
)
find_library
(
${
library
}
_LIBRARY
${
library
}
)
if
(
${
library
}
_LIBRARY
)
pkg_check_modules
(
${
library
}
_LIBRARY lib
${
library
}
)
set
(
FFmpeg_CFLAGS
"
${
FFmpeg_CFLAGS
}
${${
library
}
_LIBRARY_CFLAGS
}
"
)
set
(
FFmpeg_LIBRARIES
"
${
library
}
;
${
FFmpeg_LIBRARIES
}
"
)
pkg_check_modules
(
${
library
}
_LIBRARY lib
${
library
}
)
set
(
FFmpeg_LIBRARIES
"
${
library
}
;
${
FFmpeg_LIBRARIES
}
"
)
if
(
${
library
}
_LIBRARY_CFLAGS
)
set
(
FFmpeg_CFLAGS
${
FFmpeg_CFLAGS
}
${${
library
}
_LIBRARY_CFLAGS
}
)
endif
(
${
library
}
_LIBRARY_CFLAGS
)
endif
(
${
library
}
_LIBRARY
)
endforeach
(
library
)
set
(
FFmpeg_LIBRARIES
"
${
FFmpeg_LIBRARIES
}
"
CACHE INTERNAL STRING
)
endif
(
NOT FFmpeg_FOUND
)
if
(
FFmpeg_FOUND
)
if
(
NOT FFmpeg_FIND_QUIETLY
)
message
(
STATUS
"Found FFmpeg in:
${
FFmpeg_LIBRARIES
}
"
)
endif
(
NOT FFmpeg_FIND_QUIETLY
)
if
(
NOT FFmpeg_FIND_QUIETLY
)
message
(
STATUS
"Found FFmpeg in:
${
FFmpeg_LIBRARIES
}
"
)
endif
(
NOT FFmpeg_FIND_QUIETLY
)
else
(
FFmpeg_FOUND
)
if
(
FFmpeg_FIND_REQUIRED
)
message
(
FATAL_ERROR
"Could not find the library containing FFmpeg"
)
endif
(
FFmpeg_FIND_REQUIRED
)
if
(
FFmpeg_FIND_REQUIRED
)
message
(
FATAL_ERROR
"Could not find the library containing FFmpeg"
)
endif
(
FFmpeg_FIND_REQUIRED
)
endif
(
FFmpeg_FOUND
)
mark_as_advanced
(
FFmpeg_LIBRARIES
)
...
...
extras/buildsystem/cmake/include/config.cmake
View file @
81472e42
...
...
@@ -339,6 +339,7 @@ if(APPLE)
COMMAND find
${
CMAKE_BINARY_DIR
}
/po -name *.gmo -exec sh -c \"mkdir -p
${
MacOS
}
/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES\; ln -s {}
${
MacOS
}
/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES/vlc.mo\"
"
\;
"
COMMAND ln -sf VLC
${
MacOS
}
/clivlc
#useless?
COMMAND printf
"APPLVLC#"
>
${
CMAKE_CURRENT_BINARY_DIR
}
/VLC.app/Contents/PkgInfo
COMMAND rm -Rf
${
CMAKE_CURRENT_BINARY_DIR
}
/tmp
)
set
(
MacOS
)
...
...
@@ -446,17 +447,18 @@ endif (${ALSA_FOUND})
find_package
(
FFmpeg
)
if
(
FFmpeg_FOUND
)
string
(
REPLACE
";"
" "
FFmpeg_CFLAGS
"
${
FFmpeg_CFLAGS
}
"
)
set
(
CMAKE_REQUIRED_FLAGS_saved
${
CMAKE_REQUIRED_FLAGS
}
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
${
FFmpeg_CFLAGS
}
"
)
#set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CONTRIB_INCLUDE}/ffmpeg )
set
(
CMAKE_REQUIRED_FLAGS
${
FFmpeg_CFLAGS
}
)
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
(
swscale.h
)
check_include_files
(
"stdint.h;postproc/postprocess.h"
HAVE_POSTPROC_POSTPROCESS_H
)
vlc_enable_modules
(
ffmpeg
)
vlc_add_module_compile_flag
(
ffmpeg
${
FFmpeg_CFLAGS
}
)
vlc_add_module_compile_flag
(
ffmpeg
${
FFmpeg_CFLAGS
}
)
vlc_module_add_link_libraries
(
ffmpeg
${
FFmpeg_LIBRARIES
}
)
set
(
CMAKE_REQUIRED_FLAGS
${
CMAKE_REQUIRED_FLAGS_saved
}
)
...
...
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